Commit 9fc1c6d1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove META_ENGINE object type

parent 6d1bdaf0
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
#define VLC_OBJECT_OSDMENU (-28) #define VLC_OBJECT_OSDMENU (-28)
#define VLC_OBJECT_HTTPD_HOST (-30) #define VLC_OBJECT_HTTPD_HOST (-30)
#define VLC_OBJECT_META_ENGINE (-31)
#define VLC_OBJECT_INTERACTION (-32) #define VLC_OBJECT_INTERACTION (-32)
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
......
...@@ -130,7 +130,6 @@ static int vlc_object_type_from_string( const char *psz_name ) ...@@ -130,7 +130,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_FILTER, "filter" }, { VLC_OBJECT_FILTER, "filter" },
{ VLC_OBJECT_OSDMENU, "osdmenu" }, { VLC_OBJECT_OSDMENU, "osdmenu" },
{ VLC_OBJECT_HTTPD_HOST, "httpd_host" }, { VLC_OBJECT_HTTPD_HOST, "httpd_host" },
{ VLC_OBJECT_META_ENGINE, "meta_engine" },
{ VLC_OBJECT_GENERIC, "generic" }, { VLC_OBJECT_GENERIC, "generic" },
{ 0, "" } }; { 0, "" } };
int i; int i;
......
...@@ -94,7 +94,8 @@ int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item ) ...@@ -94,7 +94,8 @@ int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item )
assert( i_mandatory ); assert( i_mandatory );
/* FIXME: object creation is overkill, use p_private */ /* 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_NOINTERACT;
p_me->i_flags |= OBJECT_FLAGS_QUIET; p_me->i_flags |= OBJECT_FLAGS_QUIET;
p_me->i_mandatory = i_mandatory; p_me->i_mandatory = i_mandatory;
......
...@@ -317,10 +317,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -317,10 +317,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof( announce_handler_t ); i_size = sizeof( announce_handler_t );
psz_type = "announce"; psz_type = "announce";
break; break;
case VLC_OBJECT_META_ENGINE:
i_size = sizeof( meta_engine_t );
psz_type = "meta engine";
break;
case VLC_OBJECT_OSDMENU: case VLC_OBJECT_OSDMENU:
i_size = sizeof( osd_menu_t ); i_size = sizeof( osd_menu_t );
psz_type = "osd menu"; psz_type = "osd menu";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment