Remove VLC_OBJECT_OPENGL

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 84745eb781fd5f77e26728dfc22e327d30e138ec..aac0042f24c6deafb4af41273440fef3ef69cddd 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -41,7 +41,6 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_OSDMENU     (-28)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */

diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index a1f112115a1c7c98df576c40bb0305713ed1d64a..593bd1fe1941d8f77d3c9edbf8e8943d27575c6f 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -97,7 +97,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_AOUT, "aout" },
           { VLC_OBJECT_PACKETIZER, "packetizer" },
           { VLC_OBJECT_ENCODER, "encoder" },
-          { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };

diff --git a/src/misc/objects.c b/src/misc/objects.c
index af215e2be1bc119b89cea9dfa5d1ddc5fd1b6ae8..9493a013bf2d9471561e83889310d440c4f2b670 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(aout_instance_t);
             psz_type = "audio output";
             break;
-        case VLC_OBJECT_OPENGL:
-            i_size = sizeof( vout_thread_t );
-            psz_type = "opengl";
-            break;
         default:
             assert( i_type > 0 ); /* unknown type?! */
             i_size = i_type;