XML: simplify demuxers

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

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 70234dae0339fdf2f718c6c7b0fce380d1c8a170..0d550c4cafc27f0ff6e919e1d60085782c41cc71 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * b4s.c : B4S playlist format import
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -31,14 +31,12 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_interface.h>
 #include <vlc_xml.h>
 
 #include "playlist.h"
 
 struct demux_sys_t
 {
-    char *psz_prefix;
 };
 
 /*****************************************************************************
@@ -46,7 +44,6 @@ struct demux_sys_t
  *****************************************************************************/
 static int Demux( demux_t *p_demux);
 static int Control( demux_t *p_demux, int i_query, va_list args );
-//static char *GetNextToken(char *psz_cur_string);
 static int IsWhitespace( char *psz_string );
 
 /*****************************************************************************
@@ -56,7 +53,6 @@ int Import_B4S( vlc_object_t *p_this )
 {
     DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
                                       "using B4S playlist reader" );
-    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
     return VLC_SUCCESS;
 }
 
@@ -68,7 +64,6 @@ void Close_B4S( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t *)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    free( p_sys->psz_prefix );
     free( p_sys );
 }
 
@@ -76,24 +71,20 @@ static int Demux( demux_t *p_demux )
 {
     int i_ret = -1;
 
-    xml_t *p_xml;
     xml_reader_t *p_xml_reader = NULL;
     char *psz_elname = NULL;
     input_item_t *p_input;
     char *psz_mrl = NULL, *psz_title = NULL, *psz_genre = NULL;
     char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
+    input_item_node_t *p_subitems = NULL;
 
     input_item_t *p_current_input = GetCurrentItem(p_demux);
 
-    p_xml = xml_Create( p_demux );
-    if( !p_xml )
-        goto end;
-
     psz_elname = stream_ReadLine( p_demux->s );
     free( psz_elname );
     psz_elname = NULL;
 
-    p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
+    p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
     if( !p_xml_reader )
         goto end;
 
@@ -163,6 +154,8 @@ static int Demux( demux_t *p_demux )
         free( psz_value );
     }
 
+    p_subitems = input_item_node_Create( p_current_input );
+
     while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 )
     {
         // Get the node type
@@ -198,7 +191,7 @@ static int Demux( demux_t *p_demux )
                     }
                     else
                     {
-                        msg_Warn( p_demux, "unexpected attribure %s in element %s",
+                        msg_Warn( p_demux, "unexpected attribute %s in element %s",
                                   psz_name, psz_elname );
                         free( psz_value );
                     }
@@ -266,7 +259,7 @@ static int Demux( demux_t *p_demux )
                     if( psz_bitrate )
                         msg_Err( p_demux, "Unsupported meta bitrate" );
 
-                    input_item_AddSubItem( p_current_input, p_input );
+                    input_item_node_AppendItem( p_subitems, p_input );
                     vlc_gc_decref( p_input );
                     FREENULL( psz_title );
                     FREENULL( psz_mrl );
@@ -292,11 +285,12 @@ static int Demux( demux_t *p_demux )
 end:
     free( psz_elname );
 
+    if( p_subitems )
+        input_item_node_PostAndDelete( p_subitems );
+
     vlc_gc_decref( p_current_input );
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
-    if( p_xml )
-        xml_Delete( p_xml );
+        xml_ReaderDelete( p_xml_reader );
     return i_ret;
 }
 
@@ -306,29 +300,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     return VLC_EGENERIC;
 }
 
-#if 0
-/**
- * Get a in-string pointer to the start of the next token from a
- * string terminating the pointer returned by a previous call.
- *
- * \param psz_cur_string The string to search for the token from
- * \return a pointer to withing psz_cur_string, or NULL if no token
- * was found
- * \note The returned pointer may contain more than one
- * token, Run GetNextToken once more to terminate the token properly
- */
-static char *GetNextToken(char *psz_cur_string) {
-    while (*psz_cur_string && !isspace(*psz_cur_string))
-        psz_cur_string++;
-    if (!*psz_cur_string)
-        return NULL;
-    *psz_cur_string++ = '\0';
-    while (*psz_cur_string && isspace(*psz_cur_string))
-        psz_cur_string++;
-    return psz_cur_string;
-}
-#endif
-
 static int IsWhitespace( char *psz_string )
 {
     while( *psz_string )