Skip to content

V
vlc
Commit 53ffe350 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Don't only play the playlist in playlist demuxers (Closes #84)

parent bb745c8c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
modules/demux/playlist/b4s.c
View file @ 53ffe350
...@@ -391,11 +391,13 @@ static int Demux( demux_t *p_demux ) ...@@ -391,11 +391,13 @@ static int Demux( demux_t *p_demux )
} }
/* Go back and play the playlist */ /* Go back and play the playlist */
if( b_play ) if( b_play && p_playlist->status.p_item &&
p_playlist->status.p_item->i_children > 0 )
{ {
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
p_playlist->status.i_view, p_playlist->status.i_view,
p_playlist->status.p_item, NULL ); p_playlist->status.p_item,
p_playlist->status.p_item->pp_children[0] );
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
......
modules/demux/playlist/m3u.c
View file @ 53ffe350
...@@ -243,11 +243,13 @@ static int Demux( demux_t *p_demux ) ...@@ -243,11 +243,13 @@ static int Demux( demux_t *p_demux )
} }
/* Go back and play the playlist */ /* Go back and play the playlist */
if( b_play ) if( b_play && p_playlist->status.p_item &&
p_playlist->status.p_item->i_children > 0 )
{ {
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
p_playlist->status.i_view, p_playlist->status.i_view,
p_playlist->status.p_item, NULL ); p_playlist->status.p_item,
p_playlist->status.p_item->pp_children[0] );
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
......
modules/demux/playlist/pls.c
View file @ 53ffe350
...@@ -272,11 +272,13 @@ static int Demux( demux_t *p_demux ) ...@@ -272,11 +272,13 @@ static int Demux( demux_t *p_demux )
psz_name = NULL; psz_name = NULL;
} }
if( b_play ) if( b_play && p_playlist->status.p_item &&
p_playlist->status.p_item->i_children > 0 )
{ {
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
p_playlist->status.i_view, p_playlist->status.i_view,
p_playlist->status.p_item, NULL ); p_playlist->status.p_item,
p_playlist->status.p_item->pp_children[0] );
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return VLC_SUCCESS; return VLC_SUCCESS;
......
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