From 9fc1c6d158fdc6bd7691f79396a7bd5e22805705 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 29 Mar 2008 11:24:33 +0200 Subject: [PATCH] Remove META_ENGINE object type --- include/vlc_objects.h | 2 +- modules/misc/lua/objects.c | 1 - src/input/meta.c | 3 ++- src/misc/objects.c | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index ba8b7295cb..9204be4c76 100644 --- 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 f75911077c..65f1b5e943 100644 --- 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 8c46964816..538951f372 100644 --- 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 98704d90dd..440a739a43 100644 --- 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"; -- 2.39.2