Allow specifying options specific to each url in the shout service discovery.

[vlc] / modules / demux / playlist / xspf.c

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index dcd5723371336a5262dbabc3cedb0cbb1ac917c7..049ab8510e84d188b27fdc1847c84bfb9427b2e4 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -70,7 +70,7 @@ void E_(Close_xspf)( vlc_object_t *p_this )
  */
 int Demux( demux_t *p_demux )
 {
-    int i_ret = VLC_SUCCESS;
+    int i_ret = 1;
     xml_t *p_xml = NULL;
     xml_reader_t *p_xml_reader = NULL;
     char *psz_name = NULL;
@@ -83,47 +83,59 @@ int Demux( demux_t *p_demux )
     /* create new xml parser from stream */
     p_xml = xml_Create( p_demux );
     if( !p_xml )
-        i_ret = VLC_ENOMOD;
+        i_ret = -1;
     else
     {
         p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
         if( !p_xml_reader )
-            i_ret = VLC_EGENERIC;
+            i_ret = -1;
     }
 
     /* locating the root node */
-    if( i_ret == VLC_SUCCESS )
+    if( i_ret == 1 )
     {
         do
         {
             if( xml_ReaderRead( p_xml_reader ) != 1 )
             {
                 msg_Err( p_demux, "can't read xml stream" );
-                i_ret = VLC_EGENERIC;
+                i_ret = -1;
             }
         } while( i_ret == VLC_SUCCESS &&
                  xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM );
     }
     /* checking root node name */
-    if( i_ret == VLC_SUCCESS )
+    if( i_ret == 1 )
     {
         psz_name = xml_ReaderName( p_xml_reader );
         if( !psz_name || strcmp( psz_name, "playlist" ) )
         {
             msg_Err( p_demux, "invalid root node name: %s", psz_name );
-            i_ret = VLC_EGENERIC;
+            i_ret = -1;
         }
         FREE_NAME();
     }
 
-    i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input,
-                                 p_xml_reader, "playlist" );
+    if( i_ret == 1 )
+        i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input,
+                                     p_xml_reader, "playlist" ) ? 0 : -1;
+
+    int i;
+    for( i = 0 ; i < p_demux->p_sys->i_tracklist_entries ; i++ )
+    {
+        input_item_t *p_new_input = p_demux->p_sys->pp_tracklist[i];
+        if( p_new_input )
+        {
+            input_ItemAddSubItem( p_current_input, p_new_input );
+        }
+    }
+
     HANDLE_PLAY_AND_RELEASE;
     if( p_xml_reader )
         xml_ReaderDelete( p_xml, p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
-    return -1; /* Needed for correct operation of go back */
+    return i_ret; /* Needed for correct operation of go back */
 }
 
 /** \brief dummy function for demux callback interface */
@@ -477,7 +489,6 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                 if( !strcmp( psz_name, psz_element ) )
                 {
                     FREE_ATT();
-                    input_ItemAddSubItem( p_input_item, p_new_input );
                     if( p_demux->p_sys->i_identifier <
                         p_demux->p_sys->i_tracklist_entries )
                     {
@@ -541,6 +552,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                            free( psz_uri );
                            psz_uri = psz_tmp;
                         }
+                        /* FIXME: We are leaking that one */
                         p_new_input = input_ItemNewExt( p_playlist, psz_uri,
                                                         NULL, 0, NULL, -1 );
                         free( psz_uri );
@@ -636,7 +648,7 @@ static vlc_bool_t set_item_info SIMPLE_INTERFACE
     }
     else if( !strcmp( psz_name, "image" ) )
     {
-        const char *psz_uri = decode_URI_duplicate( psz_value );
+        char *psz_uri = decode_URI_duplicate( psz_value );
         input_item_SetArtURL( p_input, psz_uri );
         free( psz_uri );
     }
@@ -655,6 +667,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
     char *psz_application = NULL;
     int i_node;
     xml_elem_hnd_t *p_handler = NULL;
+    input_item_t *p_new_input = NULL;
 
     xml_elem_hnd_t pl_elements[] =
         { {"node",  COMPLEX_CONTENT, {.cmplx = parse_extension_node} },
@@ -676,10 +689,11 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
         /* attribute: title */
         if( !strcmp( psz_name, "title" ) )
         {
-            psz_title = unescape_URI_duplicate( psz_value );
+            resolve_xml_special_chars( psz_value );
+            psz_title = strdup( psz_value );
         }
         /* extension attribute: application */
-        if( !strcmp( psz_name, "application" ) )
+        else if( !strcmp( psz_name, "application" ) )
         {
             psz_application = strdup( psz_value );
         }
@@ -691,14 +705,23 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
     }
 
     /* attribute title is mandatory except for <extension> */
-    if( !strcmp( psz_element, "node" ) && !psz_title )
+    if( !strcmp( psz_element, "node" ) )
     {
-        msg_Warn( p_demux, "<node> requires \"title\" attribute" );
-        return VLC_FALSE;
+        if( !psz_title )
+        {
+            msg_Warn( p_demux, "<node> requires \"title\" attribute" );
+            return VLC_FALSE;
+        }
+        p_new_input = input_ItemNewWithType( VLC_OBJECT( p_playlist ), "vlc:skip",
+                                psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY );
+        if( p_new_input )
+        {
+            input_ItemAddSubItem( p_input_item, p_new_input );
+            p_input_item = p_new_input;
+        }
+        free( psz_title );
     }
-    free( psz_title );
-
-    if( !strcmp( psz_element, "extension" ) )
+    else if( !strcmp( psz_element, "extension" ) )
     {
         if( !psz_application )
         {
@@ -824,6 +847,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
  */
 static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
 {
+    input_item_t *p_new_input = NULL;
     char *psz_name = NULL;
     char *psz_value = NULL;
     int i_href = -1;
@@ -858,13 +882,20 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
         return VLC_FALSE;
     }
 
-    if( i_href > p_demux->p_sys->i_tracklist_entries )
+    if( i_href >= p_demux->p_sys->i_tracklist_entries )
     {
         msg_Warn( p_demux, "invalid \"href\" attribute" );
         return VLC_FALSE;
     }
 
-    /* fix for #1293 - XTAG sends ENDELEM for self closing tag */
+    p_new_input = p_demux->p_sys->pp_tracklist[ i_href ];
+    if( p_new_input )
+    {
+        input_ItemAddSubItem( p_input_item, p_new_input );
+        p_demux->p_sys->pp_tracklist[i_href] = NULL;
+    }
+
+    /* kludge for #1293 - XTAG sends ENDELEM for self closing tag */
     /* (libxml sends NONE) */
     xml_ReaderRead( p_xml_reader );