* playlist/* When telling the playlist to play the node, don't check for i_children...

diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index d02ac19ffcce44a2e003d13ff779624b6e4d1653..bd8c60896f953362ff120c4cad4841f982e47e79 100644 (file)
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -83,7 +83,7 @@ void E_(Close_GVP) ( vlc_object_t * );
 
 #define HANDLE_PLAY_AND_RELEASE \
     /* Go back and play the playlist */ \
-    if( b_play && p_item_in_category && p_item_in_category->i_children > 0 ) \
+    if( b_play && p_item_in_category ) \
         playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_item_in_category, \
-                          NULL ); \
+                          VLC_TRUE ); \
     vlc_object_release( p_playlist );

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index bf1b2a4ba0b16e6876b0b1b6dcb76ed2b896b983..e723f6fc73b65dc6b35823f7304f5942be91c966 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -119,6 +119,12 @@ static int Demux( demux_t *p_demux )
             free( psz_line );
             continue;
         }
+        if( !strcasecmp( psz_key, "numberofentries" ) )
+        {
+            msg_Dbg( p_demux, "pls should have %d entries", atoi(psz_value) ); 
+            free( psz_line);
+            continue;
+        }
         /* find the number part of of file1, title1 or length1 etc */
         i_key_length = strlen( psz_key );
         if( i_key_length >= 4 ) /* Ref1 type case */