-#define xml_ReaderRead( a ) a->pf_read( a )
-#define xml_ReaderNodeType( a ) a->pf_node_type( a )
-#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
+VLC_API xml_reader_t * xml_ReaderCreate(vlc_object_t *, stream_t *) VLC_USED;
+#define xml_ReaderCreate( a, s ) xml_ReaderCreate(VLC_OBJECT(a), s)
+VLC_API void xml_ReaderDelete(xml_reader_t *);
+VLC_API xml_reader_t * xml_ReaderReset(xml_reader_t *, stream_t *) VLC_USED;
+
+static inline int xml_ReaderNextNode( xml_reader_t *reader, const char **pval )
+{
+ return reader->pf_next_node( reader, pval );
+}
+
+static inline const char *xml_ReaderNextAttr( xml_reader_t *reader,
+ const char **pval )
+{
+ return reader->pf_next_attr( reader, pval );
+}
+
+static inline int xml_ReaderUseDTD( xml_reader_t *reader )
+{
+ return reader->pf_use_dtd( reader );
+}
+
+static inline int xml_ReaderIsEmptyElement( xml_reader_t *reader )
+{
+ if(reader->pf_is_empty == NULL)
+ return -2;
+
+ return reader->pf_is_empty( reader );
+}
+
+enum {
+ XML_READER_NONE=0,
+ XML_READER_STARTELEM,
+ XML_READER_ENDELEM,
+ XML_READER_TEXT,
+};