Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / misc / xml.c

diff --git a/src/misc/xml.c b/src/misc/xml.c
index e5c73ab671f7c7afa8d149c18702e793c05e1755..1748bfc9f69a2729a1c2185fc60d477152793f07 100644 (file)
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  * xml.c: XML parser wrapper for XML modules
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
- * $Id$
+ * Copyright (C) 2004-2010 the VideoLAN team
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *
@@ -26,16 +25,18 @@
 #endif
 
 #include <vlc_common.h>
-#include "vlc_xml.h"
+#include <vlc_xml.h>
+#include <vlc_modules.h>
 #include "../libvlc.h"
 
+#undef xml_Create
 /*****************************************************************************
  * xml_Create:
  *****************************************************************************
  * Create an instance of an XML parser.
  * Returns NULL on error.
  *****************************************************************************/
-xml_t *__xml_Create( vlc_object_t *p_this )
+xml_t *xml_Create( vlc_object_t *p_this )
 {
     xml_t *p_xml;
 
@@ -46,7 +47,6 @@ xml_t *__xml_Create( vlc_object_t *p_this )
     p_xml->p_module = module_need( p_xml, "xml", NULL, false );
     if( !p_xml->p_module )
     {
-        vlc_object_detach( p_xml );
         vlc_object_release( p_xml );
         msg_Err( p_this, "XML provider not found" );
         return NULL;
@@ -61,6 +61,73 @@ xml_t *__xml_Create( vlc_object_t *p_this )
 void xml_Delete( xml_t *p_xml )
 {
     module_unneed( p_xml, p_xml->p_module );
-    vlc_object_detach( p_xml );
     vlc_object_release( p_xml );
 }
+
+
+#undef xml_ReaderCreate
+/**
+ * Creates an XML reader.
+ * @param obj parent VLC object
+ * @param stream stream to read XML from
+ * @return NULL on error.
+ */
+xml_reader_t *xml_ReaderCreate(vlc_object_t *obj, stream_t *stream)
+{
+    xml_reader_t *reader;
+
+    reader = vlc_custom_create(obj, sizeof(*reader), VLC_OBJECT_GENERIC,
+                               "xml reader");
+    vlc_object_attach(reader, obj);
+
+    reader->p_stream = stream;
+    reader->p_module = module_need(reader, "xml reader", NULL, false);
+    if (unlikely(reader->p_module == NULL))
+    {
+        msg_Err(reader, "XML reader not found");
+        vlc_object_release(reader);
+        return NULL;
+    }
+    return reader;
+}
+
+
+/**
+ * Deletes an XML reader.
+ * @param reader XML reader created with xml_RaederCreate().
+ */
+void xml_ReaderDelete(xml_reader_t *reader)
+{
+    if (reader->p_stream)
+        module_stop(reader, reader->p_module);
+    module_release(reader->p_module);
+    vlc_object_release(reader);
+}
+
+
+/**
+ * Resets an existing XML reader.
+ * If you need to parse several XML files, this function is much faster than
+ * xml_ReaderCreate() and xml_ReaderDelete() combined.
+ * If the stream parameter is NULL, the XML reader will be stopped, but
+ * not restarted until the next xml_ReaderReset() call with a non-NULL stream.
+ *
+ * @param reader XML reader to reinitialize
+ * @param stream new stream to read XML data from (or NULL)
+ * @return reader on success,
+ *         NULL on error (in that case, the reader is destroyed).
+ */
+xml_reader_t *xml_ReaderReset(xml_reader_t *reader, stream_t *stream)
+{
+    if (reader->p_stream)
+        module_stop(reader, reader->p_module);
+
+    reader->p_stream = stream;
+    if ((stream != NULL) && module_start(reader, reader->p_module))
+    {
+        module_release(reader->p_module);
+        vlc_object_release(reader);
+        return NULL;
+    }
+    return reader;
+}