Remove VLC_OBJECT_INTERACTION

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 45c5347d4ffbfdc136ef2ab18dc84ff9b24a87a9..a6091330ebfd3e49666d3167bad116d2624566cb 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -47,7 +47,6 @@
 #define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_FILTER      (-22)
 #define VLC_OBJECT_OSDMENU     (-28)
-#define VLC_OBJECT_INTERACTION (-32)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)

diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index 141b6b44d9c546072518ba351aff04da23f5b5f8..2822f1fe21a9d8fc26d799b94e53018d0d0d406e 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -103,7 +103,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
-          { VLC_OBJECT_INTERACTION, "interaction" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };
     int i;

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 9dc2483bef0b52e8e2619d261d8eecdba490e925..85aef361ad57001c5faee7861664971443a4d6d6 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -270,10 +270,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_INTERACTION:
-            i_size = sizeof( interaction_t );
-            psz_type = "interaction";
-            break;
         default:
             i_size = i_type > (int)sizeof(vlc_object_t)
                          ? i_type : (int)sizeof(vlc_object_t);