XML reader: use VLC object and plugin infrastructures

[vlc] / src / misc / xml.c

diff --git a/src/misc/xml.c b/src/misc/xml.c
index c9f16fbc6d7408339a3c0e73a319d514cc6f2e6a..f5e2fec74b51d427cf39706e6f7c6ea9ad63b1b6 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>
  *
@@ -25,17 +24,19 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-
-#include "vlc_xml.h"
+#include <vlc_common.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;
 
@@ -43,10 +44,9 @@ xml_t *__xml_Create( vlc_object_t *p_this )
                                "xml" );
     vlc_object_attach( p_xml, p_this );
 
-    p_xml->p_module = module_Need( p_xml, "xml", 0, 0 );
+    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;
@@ -60,7 +60,44 @@ 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 );
+    module_unneed( p_xml, p_xml->p_module );
     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)
+{
+    module_unneed(reader, reader->p_module);
+    vlc_object_release(reader);
+}