]> git.sesse.net Git - vlc/blobdiff - modules/demux/playlist/qtl.c
xml_ReaderDelete: remove useless parameter
[vlc] / modules / demux / playlist / qtl.c
index cdd7becc8a3af92b1c1244372a71f768dfa378e6..b3f4d733ff6a753162dd040bbcf9606642d3d6bd 100644 (file)
@@ -124,7 +124,7 @@ static int Demux( demux_t *p_demux )
     char *psz_mimetype = NULL;
     int i_volume = 100;
 
-    INIT_PLAYLIST_STUFF;
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
 
     p_xml = xml_Create( p_demux );
     if( !p_xml )
@@ -304,30 +304,32 @@ static int Demux( demux_t *p_demux )
     }
     else
     {
+        input_item_node_t *p_subitems = input_item_node_Create( p_current_input );
         p_input = input_item_New( p_demux, psz_src, psz_moviename );
 #define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \
                     p_input, "QuickTime Media Link", type, "%s", field ) ; }
         SADD_INFO( "href", psz_href );
         SADD_INFO( _("Mime"), psz_mimetype );
-        input_item_AddSubItem( p_current_input, p_input );
+        input_item_node_AppendItem( p_subitems, p_input );
         vlc_gc_decref( p_input );
         if( psz_qtnext )
         {
             p_input = input_item_New( p_demux, psz_qtnext, NULL );
-            input_item_AddSubItem( p_current_input, p_input );
+            input_item_node_AppendItem( p_subitems, p_input );
             vlc_gc_decref( p_input );
         }
+        input_item_node_PostAndDelete( p_subitems );
     }
 
     i_ret = 0; /* Needed for correct operation of go back */
 
 error:
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
 
-    HANDLE_PLAY_AND_RELEASE;
+    vlc_gc_decref(p_current_input);
 
     free( psz_href );
     free( psz_moviename );