Commit 4050212f authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

input: SoutKeep() needs to pay attention to the cases where the playlist doesn't exists.


Signed-off-by: Rafaël Carré's avatarRafaël Carré <funman@videolan.org>
parent cdece8c9
...@@ -1381,7 +1381,8 @@ static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, ...@@ -1381,7 +1381,8 @@ static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item,
if( b_keep_sout ) if( b_keep_sout )
{ {
/* Remove the sout from the playlist garbage collector */ /* Remove the sout from the playlist garbage collector */
/* FIXME: we don't want to depend on the playlist */ /* FIXME: we don't want to depend on the playlist, sout
* should be attached to libvlc */
playlist_t * p_playlist = vlc_object_find( p_parent, playlist_t * p_playlist = vlc_object_find( p_parent,
VLC_OBJECT_PLAYLIST, FIND_PARENT ); VLC_OBJECT_PLAYLIST, FIND_PARENT );
if( p_playlist ) if( p_playlist )
...@@ -1413,10 +1414,14 @@ static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, ...@@ -1413,10 +1414,14 @@ static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item,
return p_sout; return p_sout;
} }
static void SoutKeep( sout_instance_t *p_sout ) static void SoutKeep( sout_instance_t *p_sout )
{ {
/* attach sout to the playlist */ /* FIXME: we don't want to depend on the playlist, sout
playlist_t *p_playlist = pl_Yield( p_sout ); * should be attached to libvlc */
playlist_t * p_playlist = vlc_object_find( p_sout, VLC_OBJECT_PLAYLIST,
FIND_PARENT );
if( !p_playlist ) return;
msg_Dbg( p_sout, "sout has been kept" ); msg_Dbg( p_sout, "sout has been kept" );
vlc_object_attach( p_sout, p_playlist ); vlc_object_attach( p_sout, p_playlist );
......
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