xml_ReaderDelete: remove useless parameter

[vlc] / modules / gui / skins2 / parser / xmlparser.cpp

diff --git a/modules/gui/skins2/parser/xmlparser.cpp b/modules/gui/skins2/parser/xmlparser.cpp
index 793affb2647faae1aaca5c3cbf0c8833c5d2319d..f45dc0ffd00272d2181ef7bded84a2515bb7a020 100644 (file)
--- a/modules/gui/skins2/parser/xmlparser.cpp
+++ b/modules/gui/skins2/parser/xmlparser.cpp
@@ -23,6 +23,7 @@
 
 #include "xmlparser.hpp"
 #include "../src/os_factory.hpp"
+#include <vlc_url.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
@@ -45,14 +46,19 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName,
         return;
     }
 
-    // Avoid duplicate initialization (mutex needed ?)
-    if( !m_initialized )
-    {
-        LoadCatalog();
-        m_initialized = true;
-    }
+    // Avoid duplicate initialization (mutex needed ?) -> doesn't work
+    // Reinitialization required for a new XMLParser
+    // if( !m_initialized )
+    // {
+    //    LoadCatalog();
+    //    m_initialized = true;
+    // }
+    LoadCatalog();
+
+    char* psz_uri = make_URI( rFileName.c_str(), NULL );
+    m_pStream = stream_UrlNew( pIntf, psz_uri );
+    free( psz_uri );
 
-    m_pStream = stream_UrlNew( pIntf, rFileName.c_str() );
     if( !m_pStream )
     {
         msg_Err( getIntf(), "failed to open %s for reading",
@@ -67,14 +73,13 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName,
         return;
     }
 
-    xml_ReaderUseDTD( m_pReader, useDTD ? true : false );
-
+    xml_ReaderUseDTD( m_pReader, useDTD );
 }
 
 
 XMLParser::~XMLParser()
 {
-    if( m_pReader && m_pXML ) xml_ReaderDelete( m_pXML, m_pReader );
+    if( m_pReader ) xml_ReaderDelete( m_pReader );
     if( m_pXML ) xml_Delete( m_pXML );
     if( m_pStream ) stream_Delete( m_pStream );
 }