Typos

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

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index e70a1a5bb1c092054190de5eca7de7e4980a77a9..d10d4f5f23c8e5dad7384ab72e9317b98baf1132 100644 (file)
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -58,14 +58,6 @@ volume - 0 (mute) - 100 (max)
 #include "playlist.h"
 #include <vlc_xml.h>
 
-struct demux_sys_t
-{
-    input_item_t *p_current_input;
-
-    xml_t *p_xml;
-    xml_reader_t *p_xml_reader;
-};
-
 typedef enum { FULLSCREEN_NORMAL,
                FULLSCREEN_DOUBLE,
                FULLSCREEN_HALF,
@@ -88,9 +80,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args );
  *****************************************************************************/
 int Import_QTL( vlc_object_t *p_this )
 {
-    DEMUX_BY_EXTENSION_MSG( ".qtl", "using QuickTime Media Link reader" );
-    p_demux->p_sys->p_xml = NULL;
-    p_demux->p_sys->p_xml_reader = NULL;
+    demux_t *p_demux = (demux_t *)p_this;
+
+    if( !demux_IsPathExtension( p_demux, ".qtl" ) )
+        return VLC_EGENERIC;
+
+    p_demux->pf_demux = Demux;
+    p_demux->pf_control = Control;
+    msg_Dbg( p_demux, "using QuickTime Media Link reader" );
+
     return VLC_SUCCESS;
 }
 
@@ -99,23 +97,16 @@ int Import_QTL( vlc_object_t *p_this )
  *****************************************************************************/
 void Close_QTL( vlc_object_t *p_this )
 {
-    demux_t *p_demux = (demux_t *)p_this;
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-    if( p_sys->p_xml_reader )
-        xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
-    if( p_sys->p_xml )
-        xml_Delete( p_sys->p_xml );
-    free( p_sys );
+    (void)p_this;
 }
 
 static int Demux( demux_t *p_demux )
 {
-    demux_sys_t *p_sys = p_demux->p_sys;
     xml_t *p_xml;
-    xml_reader_t *p_xml_reader;
+    xml_reader_t *p_xml_reader = NULL;
     char *psz_eltname = NULL;
     input_item_t *p_input;
+    int i_ret = -1;
 
     /* List of all possible attributes. The only required one is "src" */
     bool b_autoplay = false;
@@ -133,22 +124,21 @@ static int Demux( demux_t *p_demux )
     char *psz_mimetype = NULL;
     int i_volume = 100;
 
-    INIT_PLAYLIST_STUFF;
-
-    p_sys->p_current_input = p_current_input;
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
 
-    p_xml = p_sys->p_xml = xml_Create( p_demux );
-    if( !p_xml ) return -1;
+    p_xml = xml_Create( p_demux );
+    if( !p_xml )
+        goto error;
 
     p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
-    if( !p_xml_reader ) return -1;
-    p_sys->p_xml_reader = p_xml_reader;
+    if( !p_xml_reader )
+        goto error;
 
     /* check root node */
     if( xml_ReaderRead( p_xml_reader ) != 1 )
     {
         msg_Err( p_demux, "invalid file (no root node)" );
-        return -1;
+        goto error;
     }
 
     if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
@@ -169,21 +159,21 @@ static int Demux( demux_t *p_demux )
             msg_Err( p_demux, "invalid root node %i, %s",
                      xml_ReaderNodeType( p_xml_reader ), psz_eltname );
             free( psz_eltname );
-            return -1;
+            goto error;
         }
     }
     free( psz_eltname );
 
-    while( xml_ReaderNextAttr( p_sys->p_xml_reader ) == VLC_SUCCESS )
+    while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
     {
-        char *psz_attrname = xml_ReaderName( p_sys->p_xml_reader );
-        char *psz_attrvalue = xml_ReaderValue( p_sys->p_xml_reader );
+        char *psz_attrname = xml_ReaderName( p_xml_reader );
+        char *psz_attrvalue = xml_ReaderValue( p_xml_reader );
 
         if( !psz_attrname || !psz_attrvalue )
         {
             free( psz_attrname );
             free( psz_attrvalue );
-            return -1;
+            goto error;
         }
 
         if( !strcmp( psz_attrname, "autoplay" ) )
@@ -314,30 +304,39 @@ 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 );
     }
 
-    HANDLE_PLAY_AND_RELEASE;
+    i_ret = 0; /* Needed for correct operation of go back */
+
+error:
+    if( p_xml_reader )
+        xml_ReaderDelete( p_xml, p_xml_reader );
+    if( p_xml )
+        xml_Delete( p_xml );
+
+    vlc_gc_decref(p_current_input);
 
     free( psz_href );
     free( psz_moviename );
     free( psz_qtnext );
     free( psz_src );
     free( psz_mimetype );
-
-    return 0; /* Needed for correct operation of go back */
+    return i_ret;
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )