Commit 6c790747 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove VLC_OBJECT_INTERACTION

parent 5277e0fe
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#define VLC_OBJECT_OPENGL (-21) #define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22) #define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_OSDMENU (-28) #define VLC_OBJECT_OSDMENU (-28)
#define VLC_OBJECT_INTERACTION (-32)
/* Please add new object types below -34 */ /* Please add new object types below -34 */
/* Please do not add new object types anyway */ /* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
......
...@@ -103,7 +103,6 @@ static int vlc_object_type_from_string( const char *psz_name ) ...@@ -103,7 +103,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_OPENGL, "opengl" }, { VLC_OBJECT_OPENGL, "opengl" },
{ VLC_OBJECT_FILTER, "filter" }, { VLC_OBJECT_FILTER, "filter" },
{ VLC_OBJECT_OSDMENU, "osdmenu" }, { VLC_OBJECT_OSDMENU, "osdmenu" },
{ VLC_OBJECT_INTERACTION, "interaction" },
{ VLC_OBJECT_GENERIC, "generic" }, { VLC_OBJECT_GENERIC, "generic" },
{ 0, "" } }; { 0, "" } };
int i; int i;
......
...@@ -270,10 +270,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -270,10 +270,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_INTERACTION:
i_size = sizeof( interaction_t );
psz_type = "interaction";
break;
default: default:
i_size = i_type > (int)sizeof(vlc_object_t) i_size = i_type > (int)sizeof(vlc_object_t)
? i_type : (int)sizeof(vlc_object_t); ? i_type : (int)sizeof(vlc_object_t);
......
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