Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
741a3b31
Commit
741a3b31
authored
Feb 20, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment, typo and spaces again
parent
3211f260
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
52 additions
and
20 deletions
+52
-20
src/playlist/engine.c
src/playlist/engine.c
+52
-20
No files found.
src/playlist/engine.c
View file @
741a3b31
...
@@ -101,7 +101,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -101,7 +101,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
p_playlist
->
b_doing_ml
=
VLC_FALSE
;
p_playlist
->
b_doing_ml
=
VLC_FALSE
;
p_playlist
->
b_auto_preparse
=
p_playlist
->
b_auto_preparse
=
var_CreateGetBool
(
p_playlist
,
"auto-preparse"
)
;
var_CreateGetBool
(
p_playlist
,
"auto-preparse"
)
;
p_playlist
->
p_root_category
=
playlist_NodeCreate
(
p_playlist
,
NULL
,
NULL
,
p_playlist
->
p_root_category
=
playlist_NodeCreate
(
p_playlist
,
NULL
,
NULL
,
0
,
NULL
);
0
,
NULL
);
...
@@ -157,6 +157,13 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -157,6 +157,13 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
return
p_playlist
;
return
p_playlist
;
}
}
/**
* Destroy playlist
*
* Destroy a playlist structure.
* \param p_playlist the playlist object
* \return nothing
*/
void
playlist_Destroy
(
playlist_t
*
p_playlist
)
void
playlist_Destroy
(
playlist_t
*
p_playlist
)
{
{
var_Destroy
(
p_playlist
,
"intf-change"
);
var_Destroy
(
p_playlist
,
"intf-change"
);
...
@@ -223,7 +230,13 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t b_force )
...
@@ -223,7 +230,13 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t b_force )
vlc_mutex_unlock
(
&
p_playlist
->
gc_lock
);
vlc_mutex_unlock
(
&
p_playlist
->
gc_lock
);
}
}
/** Main loop for the playlist */
/**
* Main loop
*
* Main loop for the playlist
* \param p_playlist the playlist object
* \return nothing
*/
void
playlist_MainLoop
(
playlist_t
*
p_playlist
)
void
playlist_MainLoop
(
playlist_t
*
p_playlist
)
{
{
playlist_item_t
*
p_item
=
NULL
;
playlist_item_t
*
p_item
=
NULL
;
...
@@ -233,7 +246,7 @@ void playlist_MainLoop( playlist_t *p_playlist )
...
@@ -233,7 +246,7 @@ void playlist_MainLoop( playlist_t *p_playlist )
if
(
p_playlist
->
b_reset_currently_playing
&&
if
(
p_playlist
->
b_reset_currently_playing
&&
mdate
()
-
p_playlist
->
last_rebuild_date
>
30000
)
// 30 ms
mdate
()
-
p_playlist
->
last_rebuild_date
>
30000
)
// 30 ms
{
{
ResetCurrentlyPlaying
(
p_playlist
,
var_GetBool
(
p_playlist
,
"random"
),
ResetCurrentlyPlaying
(
p_playlist
,
var_GetBool
(
p_playlist
,
"random"
),
p_playlist
->
status
.
p_item
);
p_playlist
->
status
.
p_item
);
p_playlist
->
last_rebuild_date
=
mdate
();
p_playlist
->
last_rebuild_date
=
mdate
();
}
}
...
@@ -281,7 +294,7 @@ check_input:
...
@@ -281,7 +294,7 @@ check_input:
p_playlist
->
status
.
p_item
=
NULL
;
p_playlist
->
status
.
p_item
=
NULL
;
}
}
i_activity
=
var_GetInteger
(
p_playlist
,
"activity"
)
;
i_activity
=
var_GetInteger
(
p_playlist
,
"activity"
)
;
var_SetInteger
(
p_playlist
,
"activity"
,
i_activity
-
var_SetInteger
(
p_playlist
,
"activity"
,
i_activity
-
DEFAULT_INPUT_ACTIVITY
);
DEFAULT_INPUT_ACTIVITY
);
goto
check_input
;
goto
check_input
;
...
@@ -362,7 +375,14 @@ check_input:
...
@@ -362,7 +375,14 @@ check_input:
PL_UNLOCK
;
PL_UNLOCK
;
}
}
/** Playlist dying last loop */
/**
* Last loop
*
* The playlist is dying so do the last loop
* \param p_playlist the playlist object
* \return nothing
*/
void
playlist_LastLoop
(
playlist_t
*
p_playlist
)
void
playlist_LastLoop
(
playlist_t
*
p_playlist
)
{
{
vlc_object_t
*
p_obj
;
vlc_object_t
*
p_obj
;
...
@@ -458,7 +478,13 @@ void playlist_LastLoop( playlist_t *p_playlist )
...
@@ -458,7 +478,13 @@ void playlist_LastLoop( playlist_t *p_playlist )
PL_UNLOCK
;
PL_UNLOCK
;
}
}
/** Main loop for preparser queue */
/**
* Preparse loop
*
* Main loop for preparser queue
* \param p_obj items to preparse
* \return nothing
*/
void
playlist_PreparseLoop
(
playlist_preparse_t
*
p_obj
)
void
playlist_PreparseLoop
(
playlist_preparse_t
*
p_obj
)
{
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_obj
->
p_parent
;
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_obj
->
p_parent
;
...
@@ -513,7 +539,7 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
...
@@ -513,7 +539,7 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
if
(
!
input_MetaSatisfied
(
p_playlist
,
p_current
,
&
i_m
,
&
i_o
)
)
if
(
!
input_MetaSatisfied
(
p_playlist
,
p_current
,
&
i_m
,
&
i_o
)
)
{
{
preparse_item_t
p
;
preparse_item_t
p
;
PL_DEBUG
(
"need to fetch meta for %s"
,
p_current
->
psz_name
);
PL_DEBUG
(
"need to fetch meta for %s"
,
p_current
->
psz_name
);
p
.
p_item
=
p_current
;
p
.
p_item
=
p_current
;
p
.
b_fetch_art
=
VLC_FALSE
;
p
.
b_fetch_art
=
VLC_FALSE
;
vlc_mutex_lock
(
&
p_playlist
->
p_fetcher
->
object_lock
);
vlc_mutex_lock
(
&
p_playlist
->
p_fetcher
->
object_lock
);
...
@@ -560,7 +586,13 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
...
@@ -560,7 +586,13 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
}
}
}
}
/** Main loop for secondary preparser queue */
/**
* Fetcher loop
*
* Main loop for secondary preparser queue
* \param p_obj items to preparse
* \return nothing
*/
void
playlist_FetcherLoop
(
playlist_fetcher_t
*
p_obj
)
void
playlist_FetcherLoop
(
playlist_fetcher_t
*
p_obj
)
{
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_obj
->
p_parent
;
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_obj
->
p_parent
;
...
@@ -607,7 +639,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
...
@@ -607,7 +639,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
INSERT_ELEM
(
p_playlist
->
p_fetcher
->
p_waiting
,
INSERT_ELEM
(
p_playlist
->
p_fetcher
->
p_waiting
,
p_playlist
->
p_fetcher
->
i_waiting
,
p_playlist
->
p_fetcher
->
i_waiting
,
0
,
p
);
0
,
p
);
PL_DEBUG
(
"meta fetched for %s, get art"
,
p_item
->
psz_name
);
PL_DEBUG
(
"meta fetched for %s, get art"
,
p_item
->
psz_name
);
vlc_mutex_unlock
(
&
p_obj
->
object_lock
);
vlc_mutex_unlock
(
&
p_obj
->
object_lock
);
continue
;
continue
;
}
}
...
@@ -636,7 +668,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
...
@@ -636,7 +668,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
i_ret
=
input_ArtFind
(
p_playlist
,
p_item
);
i_ret
=
input_ArtFind
(
p_playlist
,
p_item
);
if
(
i_ret
==
1
)
if
(
i_ret
==
1
)
{
{
PL_DEBUG
(
"downloading art for %s"
,
p_item
->
psz_name
);
PL_DEBUG
(
"downloading art for %s"
,
p_item
->
psz_name
);
if
(
input_DownloadAndCacheArt
(
p_playlist
,
p_item
)
)
if
(
input_DownloadAndCacheArt
(
p_playlist
,
p_item
)
)
input_item_SetArtNotFound
(
p_item
,
VLC_TRUE
);
input_item_SetArtNotFound
(
p_item
,
VLC_TRUE
);
else
{
else
{
...
@@ -647,13 +679,13 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
...
@@ -647,13 +679,13 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
}
}
else
if
(
i_ret
==
0
)
/* Was in cache */
else
if
(
i_ret
==
0
)
/* Was in cache */
{
{
PL_DEBUG
(
"found art for %s in cache"
,
p_item
->
psz_name
);
PL_DEBUG
(
"found art for %s in cache"
,
p_item
->
psz_name
);
input_item_SetArtFetched
(
p_item
,
VLC_TRUE
);
input_item_SetArtFetched
(
p_item
,
VLC_TRUE
);
var_SetInteger
(
p_playlist
,
"item-change"
,
p_item
->
i_id
);
var_SetInteger
(
p_playlist
,
"item-change"
,
p_item
->
i_id
);
}
}
else
else
{
{
PL_DEBUG
(
"art not found for %s"
,
p_item
->
psz_name
);
PL_DEBUG
(
"art not found for %s"
,
p_item
->
psz_name
);
input_item_SetArtNotFound
(
p_item
,
VLC_TRUE
);
input_item_SetArtNotFound
(
p_item
,
VLC_TRUE
);
}
}
vlc_gc_decref
(
p_item
);
vlc_gc_decref
(
p_item
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment