Commit 2f4258d6 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

playlist: gc_date is private.

parent 5539b7b7
...@@ -180,7 +180,6 @@ struct playlist_t ...@@ -180,7 +180,6 @@ struct playlist_t
/* Runtime */ /* Runtime */
int i_sort; /**< Last sorting applied to the playlist */ int i_sort; /**< Last sorting applied to the playlist */
int i_order; /**< Last ordering applied to the playlist */ int i_order; /**< Last ordering applied to the playlist */
mtime_t gc_date;
}; };
/** Helper to add an item */ /** Helper to add an item */
......
...@@ -82,7 +82,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -82,7 +82,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
p_playlist->i_last_playlist_id = 0; p_playlist->i_last_playlist_id = 0;
pl_priv(p_playlist)->p_input = NULL; pl_priv(p_playlist)->p_input = NULL;
p_playlist->gc_date = 0; pl_priv(p_playlist)->gc_date = 0;
pl_priv(p_playlist)->b_cant_sleep = false; pl_priv(p_playlist)->b_cant_sleep = false;
ARRAY_INIT( p_playlist->items ); ARRAY_INIT( p_playlist->items );
...@@ -215,12 +215,12 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) ...@@ -215,12 +215,12 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
{ {
if( !b_force ) if( !b_force )
{ {
if( mdate() - p_playlist->gc_date < 1000000 ) if( mdate() - pl_priv(p_playlist)->gc_date < 1000000 )
{ {
pl_priv(p_playlist)->b_cant_sleep = true; pl_priv(p_playlist)->b_cant_sleep = true;
return; return;
} }
else if( p_playlist->gc_date == 0 ) else if( pl_priv(p_playlist)->gc_date == 0 )
return; return;
} }
...@@ -241,7 +241,7 @@ static void input_selected_stream_changed( const vlc_event_t * event, void * dat ...@@ -241,7 +241,7 @@ static void input_selected_stream_changed( const vlc_event_t * event, void * dat
(void)event; (void)event;
playlist_t * p_playlist = data; playlist_t * p_playlist = data;
PL_LOCK; PL_LOCK;
p_playlist->gc_date = mdate(); pl_priv(p_playlist)->gc_date = mdate();
vlc_object_signal_unlocked( p_playlist ); vlc_object_signal_unlocked( p_playlist );
PL_UNLOCK; PL_UNLOCK;
} }
...@@ -402,7 +402,7 @@ check_input: ...@@ -402,7 +402,7 @@ check_input:
/* Destroy input */ /* Destroy input */
playlist_release_current_input( p_playlist ); playlist_release_current_input( p_playlist );
p_playlist->gc_date = mdate(); pl_priv(p_playlist)->gc_date = mdate();
pl_priv(p_playlist)->b_cant_sleep = true; pl_priv(p_playlist)->b_cant_sleep = true;
i_activity= var_GetInteger( p_playlist, "activity" ); i_activity= var_GetInteger( p_playlist, "activity" );
......
...@@ -105,6 +105,7 @@ typedef struct playlist_private_t ...@@ -105,6 +105,7 @@ typedef struct playlist_private_t
bool b_doing_ml; /**< Doing media library stuff get quicker */ bool b_doing_ml; /**< Doing media library stuff get quicker */
bool b_auto_preparse; bool b_auto_preparse;
bool b_cant_sleep; bool b_cant_sleep;
mtime_t gc_date;
} playlist_private_t; } playlist_private_t;
#define pl_priv( pl ) ((playlist_private_t *)(pl)) #define pl_priv( pl ) ((playlist_private_t *)(pl))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment