Input options inheritance for playlists

TODO

@@ -115,14 +115,12 @@ Think playlist within playlist, directory structures, SAP section, TV channels l
 Todo:<br />
 - Core support<br />
    - *** Fix meta-information (author and duration)<br />
-   - **  input options inheritance (down nodes)<br />
    - *** Improve random mode and fix loop<br />
    - *   "Name finder"<br />
    - *   "Protocol rollover" node<br />
    - *** Item moving/copying facilities<br />
    - *** Live directory representation<br /> 
 - Helper modules<br />
-   - **  Strip path in subdirectories<br />
    - **  ASX and B4S parsers (see below)<br />
    - *   Rewrite SLP announce discovery<br />
    - **  Adapt CDDAX<br />

include/vlc_input.h

@@ -88,6 +88,19 @@ static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
     vlc_mutex_init( p_o, &p_i->lock );
 }
 
+static inline void vlc_input_item_CopyOptions( input_item_t *p_parent,
+                                               input_item_t *p_child )
+{
+    int i;
+    for( i = 0 ; i< p_parent->i_options; i++ )
+    {
+        char *psz_option= strdup( p_parent->ppsz_options[i] );
+        INSERT_ELEM( p_child->ppsz_options,
+                     p_child->i_options, p_child->i_options,
+                     psz_option );
+    }
+}
+
 static inline void vlc_input_item_Clean( input_item_t *p_i )
 {
     if( p_i->psz_name ) free( p_i->psz_name );

modules/demux/playlist/m3u.c

@@ -112,7 +112,9 @@ static int Demux( demux_t *p_demux )
     char **ppsz_options = NULL;
     int i_options = 0, i;
 
-    playlist_item_t *p_item;
+    playlist_item_t *p_item, *p_current;
+
+    vlc_bool_t b_play;
 
     vlc_bool_t b_cleanup = VLC_FALSE;
 
@@ -124,8 +126,12 @@ static int Demux( demux_t *p_demux )
         return -1;
     }
 
-    playlist_ItemToNode( p_playlist, p_playlist->status.p_item );
-    p_playlist->status.p_item->input.i_type = ITEM_TYPE_PLAYLIST;
+    fprintf(stderr,"playlist item is %p\n", p_playlist->status.p_item );
+    b_play = FindItem( p_demux, p_playlist, &p_current );
+    fprintf(stderr,"current is %p\n", p_current );
+
+    playlist_ItemToNode( p_playlist, p_current );
+    p_current->input.i_type = ITEM_TYPE_PLAYLIST;
 
     psz_line = stream_ReadLine( p_demux->s );
     while( psz_line )
@@ -196,18 +202,17 @@ static int Demux( demux_t *p_demux )
             p_item->input.i_duration = i_duration;
 
             playlist_NodeAddItem( p_playlist, p_item,
-                           p_playlist->status.p_item->pp_parents[0]->i_view,
-                           p_playlist->status.p_item, PLAYLIST_APPEND,
+                                  p_current->pp_parents[0]->i_view,
+                                  p_current, PLAYLIST_APPEND,
                                   PLAYLIST_END );
 
             /* We need to declare the parents of the node as the
              *                  * same of the parent's ones */
-            for( i= 1 ; i< p_playlist->status.p_item->i_parents; i ++ )
-            {
-                    playlist_ItemAddParent( p_item,
-                              p_playlist->status.p_item->pp_parents[i]->i_view,
-                              p_playlist->status.p_item );
-            }
+            playlist_CopyParents( p_current, p_item );
+
+            vlc_input_item_CopyOptions( &p_current->input,
+                                        &p_item->input );
+
             free( psz_mrl );
         }
 
@@ -233,8 +238,12 @@ static int Demux( demux_t *p_demux )
     }
 
     /* Go back and play the playlist */
-    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_playlist->status.i_view,
+    if( b_play )
+    {
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+                          p_playlist->status.i_view,
                           p_playlist->status.p_item, NULL );
+    }
 
     vlc_object_release( p_playlist );
     return VLC_SUCCESS;

modules/demux/playlist/playlist.c

@@ -26,6 +26,7 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 #include <vlc/input.h>
+#include <vlc_playlist.h>
 
 #include "playlist.h"
 
@@ -102,3 +103,29 @@ char *ProcessMRL( char *psz_mrl, char *psz_prefix )
     asprintf( &psz_mrl, "%s%s", psz_prefix, psz_mrl );
     return psz_mrl;
 }
+
+vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist,
+                     playlist_item_t **pp_item )
+{
+     vlc_bool_t b_play;
+     if( &p_playlist->status.p_item->input ==
+         ((input_thread_t *)p_demux->p_parent)->input.p_item )
+     {
+         msg_Dbg( p_playlist, "starting playlist playback" );
+         *pp_item = p_playlist->status.p_item;
+         b_play = VLC_TRUE;
+     }
+     else
+     {
+         input_item_t *p_current = ( (input_thread_t*)p_demux->p_parent)->
+                                                        input.p_item;
+         *pp_item = playlist_ItemGetByInput( p_playlist, p_current );
+         if( !*pp_item )
+         {
+             msg_Dbg( p_playlist, "unable to find item in playlist");
+         }
+         msg_Dbg( p_playlist, "not starting playlist playback");
+         b_play = VLC_FALSE;
+     }
+     return b_play;
+}

modules/demux/playlist/playlist.h

@@ -24,6 +24,8 @@
 char *ProcessMRL( char *, char * );
 char *FindPrefix( demux_t * );
 
+vlc_bool_t FindItem( demux_t *, playlist_t *, playlist_item_t **);
+
 int Import_Old ( vlc_object_t * );
 int Import_M3U ( vlc_object_t * );
 

modules/demux/playlist/pls.c

@@ -119,6 +119,7 @@ static int Demux( demux_t *p_demux )
     int            i_new_item = 0;
     int            i_key_length;
     playlist_item_t *p_parent;
+    vlc_bool_t b_play;
 
     p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
                                                  FIND_PARENT );
@@ -127,15 +128,16 @@ static int Demux( demux_t *p_demux )
         msg_Err( p_demux, "can't find playlist" );
         return -1;
     }
-    p_parent = p_playlist->status.p_item;
+
+    b_play = FindItem( p_demux, p_playlist, p_parent );
     p_parent->input.i_type = ITEM_TYPE_PLAYLIST;
 
-//    p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
     /* Change the item to a node */
     if( p_parent->i_children == -1)
     {
         playlist_ItemToNode( p_playlist,p_parent );
     }
+
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {
         if( !strncasecmp( psz_line, "[playlist]", sizeof("[playlist]")-1 ) )
@@ -207,6 +209,9 @@ static int Demux( demux_t *p_demux )
                 i_position++;
                 free( psz_mrl );
                 psz_mrl = NULL;
+
+                vlc_input_item_CopyOptions( &p_parent->input,
+                                            &p_item->input );
             }
             else
             {
@@ -261,6 +266,9 @@ static int Demux( demux_t *p_demux )
         }
         free( psz_mrl );
         psz_mrl = NULL;
+
+        vlc_input_item_CopyOptions( &p_parent->input,
+                                    &p_item->input );
     }
     else
     {
@@ -272,8 +280,12 @@ static int Demux( demux_t *p_demux )
         psz_name = NULL;
     }
 
-    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,p_playlist->status.i_view,	
+    if( b_play )
+    {
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+                          p_playlist->status.i_view,
                           p_playlist->status.p_item, NULL );
+    }
     vlc_object_release( p_playlist );
     return VLC_SUCCESS;
 }