Commit 367279c4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

svn merge -r 11179:11181 trunk branches/0.8.2

parent 9f4baa09
...@@ -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 );
......
...@@ -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 );
......
...@@ -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;
......
...@@ -88,7 +88,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj, ...@@ -88,7 +88,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
{ "au", "au" }, { "au", "au" },
{ "flac", "flac" }, { "flac", "flac" },
{ "dv", "dv" }, { "dv", "dv" },
{ "m3u", "m3u" }, { "m3u", "playlist" },
{ "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" },
{ "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" },
{ "mod", "mod" }, { "xm", "mod" }, { "mod", "mod" }, { "xm", "mod" },
......
...@@ -611,13 +611,14 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist, ...@@ -611,13 +611,14 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist,
#ifdef PLAYLIST_DEBUG #ifdef PLAYLIST_DEBUG
if( p_item != NULL ) if( p_item != NULL )
{ {
msg_Dbg( p_playlist, "finding next of %s within %s", msg_Dbg( p_playlist, "finding next of %s within %s - root %s",
p_item->input.psz_name, p_node->input.psz_name ); p_item->input.psz_name, p_node->input.psz_name,
p_root->input.psz_name );
} }
else else
{ {
msg_Dbg( p_playlist, "finding something to play within %s", msg_Dbg( p_playlist, "finding something to play within %s -root %s",
p_node->input.psz_name ); p_node->input.psz_name, p_root->input.psz_name );
} }
#endif #endif
...@@ -652,6 +653,10 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist, ...@@ -652,6 +653,10 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist,
{ {
if( p_playlist->b_go_next ) if( p_playlist->b_go_next )
{ {
#ifdef PLAYLIST_DEBUG
msg_Dbg( p_playlist, "Moving on to next node: search from %s",
p_root->input.psz_name );
#endif
p_next = playlist_RecursiveFindNext( p_playlist, i_view, p_next = playlist_RecursiveFindNext( p_playlist, i_view,
p_root, p_item, p_search ); p_root, p_item, p_search );
if( p_next == NULL ) if( p_next == NULL )
...@@ -663,6 +668,9 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist, ...@@ -663,6 +668,9 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist,
} }
else else
{ {
#ifdef PLAYLIST_DEBUG
msg_Dbg( p_playlist, "Not moving on to next node: you loose" );
#endif
return NULL; return NULL;
} }
} }
...@@ -782,6 +790,10 @@ playlist_item_t *playlist_RecursiveFindNext( playlist_t *p_playlist, ...@@ -782,6 +790,10 @@ playlist_item_t *playlist_RecursiveFindNext( playlist_t *p_playlist,
#endif #endif
if( p_parent == p_root ) if( p_parent == p_root )
{ {
#ifdef PLAYLIST_DEBUG
msg_Dbg( p_playlist, "At root item (%s)",
p_root->input.psz_name );
#endif
/* Hmm, seems it's the end for you, guy ! */ /* Hmm, seems it's the end for you, guy ! */
return NULL; return NULL;
} }
...@@ -874,6 +886,10 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist, ...@@ -874,6 +886,10 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
#endif #endif
if( p_parent == p_root ) if( p_parent == p_root )
{ {
#ifdef PLAYLIST_DEBUG
msg_Dbg( p_playlist, "At root item (%s)",
p_root->input.psz_name );
#endif
/* Hmm, seems it's the end for you, guy ! */ /* Hmm, seems it's the end for you, guy ! */
return NULL; return NULL;
} }
......
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