ML: Remove asserts in vlc_media_library.h

[vlc] / include / vlc_xml.h

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 0788f33f470d6b482ec90d3a0fac9c81cdc7c8c8..497fc7f9334d62a7f4f19983f6ca362a3665fa8e 100644 (file)
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * xml.h
+ * xml.h: XML abstraction layer
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Author: Gildas Bazin <gbazin@videolan.org>
@@ -18,11 +18,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_XML_H
-#define _VLC_XML_H
+#ifndef VLC_XML_H
+#define VLC_XML_H
+
+/**
+ * \file
+ * This file defines functions and structures to handle xml tags in vlc
+ *
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
 
 struct xml_t
 {
@@ -32,7 +42,7 @@ struct xml_t
     module_t  *p_module;
     xml_sys_t *p_sys;
 
-    xml_reader_t * (*pf_reader_create) ( xml_t *, const char * );
+    xml_reader_t * (*pf_reader_create) ( xml_t *, stream_t * );
     void (*pf_reader_delete) ( xml_reader_t * );
 
     void (*pf_catalog_load) ( xml_t *, const char * );
@@ -40,8 +50,8 @@ struct xml_t
                                const char * );
 };
 
-#define xml_Create( a ) __xml_Create( VLC_OBJECT(a) )
-VLC_EXPORT( xml_t *, __xml_Create, ( vlc_object_t * ) );
+VLC_EXPORT( xml_t *, xml_Create, ( vlc_object_t * ) );
+#define xml_Create( a ) xml_Create( VLC_OBJECT(a) )
 VLC_EXPORT( void, xml_Delete, ( xml_t * ) );
 
 #define xml_ReaderCreate( a, b ) a->pf_reader_create( a, b )
@@ -59,6 +69,8 @@ struct xml_reader_t
     char * (*pf_name) ( xml_reader_t * );
     char * (*pf_value) ( xml_reader_t * );
     int (*pf_next_attr) ( xml_reader_t * );
+
+    int (*pf_use_dtd) ( xml_reader_t *, bool );
 };
 
 #define xml_ReaderRead( a ) a->pf_read( a )
@@ -66,10 +78,15 @@ struct xml_reader_t
 #define xml_ReaderName( a ) a->pf_name( a )
 #define xml_ReaderValue( a ) a->pf_value( a )
 #define xml_ReaderNextAttr( a ) a->pf_next_attr( a )
+#define xml_ReaderUseDTD( a, b ) a->pf_use_dtd( a, b )
 
 #define XML_READER_NONE 0
 #define XML_READER_STARTELEM 1
 #define XML_READER_ENDELEM 2
 #define XML_READER_TEXT 3
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif