demux/playlist/ : removes useless unused parameter warnings

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

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 913df304d678d6a9c1d25b0ffe84a4d75afd0342..9b2e736b96fa27ca79f34e8c58e3f357744a7756 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -20,12 +20,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *******************************************************************************/
+ ******************************************************************************/
 /**
  * \file modules/demux/playlist/xspf.c
  * \brief XSPF playlist import functions
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
@@ -70,7 +74,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,52 +87,65 @@ 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 */
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
     return VLC_EGENERIC;
 }
 
@@ -311,6 +328,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
  */
 static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE
 {
+    VLC_UNUSED(psz_element);
     char *psz_name=NULL;
     int i_node;
     int i_ntracks = 0;
@@ -540,6 +558,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 );
@@ -699,7 +718,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
             msg_Warn( p_demux, "<node> requires \"title\" attribute" );
             return VLC_FALSE;
         }
-        p_new_input = input_ItemNewWithType( VLC_OBJECT( p_playlist ), "",
+        p_new_input = input_ItemNewWithType( VLC_OBJECT( p_playlist ), "vlc:nop",
                                 psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY );
         if( p_new_input )
         {
@@ -834,6 +853,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
  */
 static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
 {
+    VLC_UNUSED(p_playlist); VLC_UNUSED(psz_element);
     input_item_t *p_new_input = NULL;
     char *psz_name = NULL;
     char *psz_value = NULL;
@@ -869,7 +889,7 @@ 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;
@@ -879,9 +899,10 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
     if( p_new_input )
     {
         input_ItemAddSubItem( p_input_item, p_new_input );
+        p_demux->p_sys->pp_tracklist[i_href] = NULL;
     }
 
-    /* fix for #1293 - XTAG sends ENDELEM for self closing tag */
+    /* kludge for #1293 - XTAG sends ENDELEM for self closing tag */
     /* (libxml sends NONE) */
     xml_ReaderRead( p_xml_reader );
 
@@ -893,6 +914,7 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
  */
 static vlc_bool_t skip_element COMPLEX_INTERFACE
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(p_playlist); VLC_UNUSED(p_input_item);
     char *psz_endname;
 
     while( xml_ReaderRead( p_xml_reader ) == 1 )