vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Aug 16 15:31:25 2014 +0300| [a73421432ee81f34cc63b89c6b9711965b305950] | committer: Rémi Denis-Courmont
playlist: set "input-current" to NULL when appropriate > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a73421432ee81f34cc63b89c6b9711965b305950 --- src/playlist/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/playlist/thread.c b/src/playlist/thread.c index ea96549..8e7b082 100644 --- a/src/playlist/thread.c +++ b/src/playlist/thread.c @@ -223,10 +223,10 @@ static void PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) vlc_object_release( p_input_thread ); p_input_thread = NULL; } - else - var_SetAddress( p_playlist, "input-current", p_input_thread ); } + var_SetAddress( p_playlist, "input-current", p_input_thread ); + /* TODO store art policy in playlist private data */ char *psz_arturl = input_item_GetArtURL( p_input ); /* p_input->p_meta should not be null after a successful CreateThread */ @@ -446,6 +446,8 @@ static void LoopInput( playlist_t *p_playlist ) PL_DEBUG( "dead input" ); PL_UNLOCK; + var_SetAddress( p_playlist, "input-current", NULL ); + /* WARNING: Input resource manipulation and callback deletion are * incompatible with the playlist lock. */ if( !var_InheritBool( p_input, "sout-keep" ) ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
