Remove META_ENGINE object type

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index ba8b7295cbefc6dd570e28233ab0d4076d6f2bba..9204be4c766e1b6e9468a099c3db728b3c84d69a 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -66,7 +66,7 @@
 #define VLC_OBJECT_OSDMENU     (-28)
 
 #define VLC_OBJECT_HTTPD_HOST  (-30)
-#define VLC_OBJECT_META_ENGINE (-31)
+
 #define VLC_OBJECT_INTERACTION (-32)
 
 #define VLC_OBJECT_GENERIC     (-666)

diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index f75911077cd73bd82afec5ad285693a3166bcfb2..65f1b5e943d28048ba38132d1cabc5826db1f88a 100644 (file)
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -130,7 +130,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_FILTER, "filter" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
           { VLC_OBJECT_HTTPD_HOST, "httpd_host" },
-          { VLC_OBJECT_META_ENGINE, "meta_engine" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };
     int i;

diff --git a/src/input/meta.c b/src/input/meta.c
index 8c46964816726cd07ef3ebc849d1186c97b1c16a..538951f372dc524b863922cf5ea1d4e99bc9aeb4 100644 (file)
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -94,7 +94,8 @@ int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item )
     assert( i_mandatory );
 
     /* FIXME: object creation is overkill, use p_private */
-    p_me = vlc_object_create( p_playlist, VLC_OBJECT_META_ENGINE );
+    p_me = vlc_custom_create( VLC_OBJECT(p_playlist), sizeof( *p_me ),
+                              VLC_OBJECT_GENERIC, "meta engine" );
     p_me->i_flags |= OBJECT_FLAGS_NOINTERACT;
     p_me->i_flags |= OBJECT_FLAGS_QUIET;
     p_me->i_mandatory = i_mandatory;

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 98704d90dd6b99afdac7b44d231f2d8fb29b23da..440a739a43e3033240a16055b37150f5266ef174 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -317,10 +317,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof( announce_handler_t );
             psz_type = "announce";
             break;
-        case VLC_OBJECT_META_ENGINE:
-            i_size = sizeof( meta_engine_t );
-            psz_type = "meta engine";
-            break;
         case VLC_OBJECT_OSDMENU:
             i_size = sizeof( osd_menu_t );
             psz_type = "osd menu";