[vlc-devel] commit: Remove XML object type ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat Mar 29 11:18:33 2008 +0200| [e24e108c767d00f3123c3d702f46595d31149c48]

Remove XML object type

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e24e108c767d00f3123c3d702f46595d31149c48
---

 include/vlc_objects.h      |    2 +-
 modules/misc/lua/objects.c |    1 -
 src/misc/objects.c         |    5 -----
 src/misc/xml.c             |    3 ++-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index e59a09e..8e52397 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -62,7 +62,7 @@
 
 
 
-#define VLC_OBJECT_XML         (-27)
+
 #define VLC_OBJECT_OSDMENU     (-28)
 #define VLC_OBJECT_STATS       (-29)
 #define VLC_OBJECT_HTTPD_HOST  (-30)
diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index 0d13cba..f759110 100644
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -128,7 +128,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_STREAM, "stream" },
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
-          { VLC_OBJECT_XML, "xml" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
           { VLC_OBJECT_HTTPD_HOST, "httpd_host" },
           { VLC_OBJECT_META_ENGINE, "meta_engine" },
diff --git a/src/misc/objects.c b/src/misc/objects.c
index a83be8a..98704d9 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -56,7 +56,6 @@
 #include "vlc_httpd.h"
 #include "vlc_vlm.h"
 #include "input/vlm_internal.h"
-#include "vlc_xml.h"
 #include "vlc_osd.h"
 #include "vlc_meta.h"
 
@@ -310,10 +309,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof( vlm_t );
             psz_type = "vlm dameon";
             break;
-        case VLC_OBJECT_XML:
-            i_size = sizeof( xml_t );
-            psz_type = "xml";
-            break;
         case VLC_OBJECT_OPENGL:
             i_size = sizeof( vout_thread_t );
             psz_type = "opengl";
diff --git a/src/misc/xml.c b/src/misc/xml.c
index f49c7ee..c9f16fb 100644
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -39,7 +39,8 @@ xml_t *__xml_Create( vlc_object_t *p_this )
 {
     xml_t *p_xml;
 
-    p_xml = vlc_object_create( p_this, VLC_OBJECT_XML );
+    p_xml = vlc_custom_create( p_this, sizeof( *p_xml ), VLC_OBJECT_GENERIC,
+                               "xml" );
     vlc_object_attach( p_xml, p_this );
 
     p_xml->p_module = module_Need( p_xml, "xml", 0, 0 );