Commit 8d3e95ab authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove VLC_OBJECT_OPENGL

parent 22040d1e
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#define VLC_OBJECT_AOUT (-10) #define VLC_OBJECT_AOUT (-10)
#define VLC_OBJECT_PACKETIZER (-13) #define VLC_OBJECT_PACKETIZER (-13)
#define VLC_OBJECT_ENCODER (-14) #define VLC_OBJECT_ENCODER (-14)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_OSDMENU (-28) #define VLC_OBJECT_OSDMENU (-28)
/* 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 */
......
...@@ -97,7 +97,6 @@ static int vlc_object_type_from_string( const char *psz_name ) ...@@ -97,7 +97,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_AOUT, "aout" }, { VLC_OBJECT_AOUT, "aout" },
{ VLC_OBJECT_PACKETIZER, "packetizer" }, { VLC_OBJECT_PACKETIZER, "packetizer" },
{ VLC_OBJECT_ENCODER, "encoder" }, { VLC_OBJECT_ENCODER, "encoder" },
{ VLC_OBJECT_OPENGL, "opengl" },
{ VLC_OBJECT_OSDMENU, "osdmenu" }, { VLC_OBJECT_OSDMENU, "osdmenu" },
{ VLC_OBJECT_GENERIC, "generic" }, { VLC_OBJECT_GENERIC, "generic" },
{ 0, "" } }; { 0, "" } };
......
...@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(aout_instance_t); i_size = sizeof(aout_instance_t);
psz_type = "audio output"; psz_type = "audio output";
break; break;
case VLC_OBJECT_OPENGL:
i_size = sizeof( vout_thread_t );
psz_type = "opengl";
break;
default: default:
assert( i_type > 0 ); /* unknown type?! */ assert( i_type > 0 ); /* unknown type?! */
i_size = i_type; i_size = i_type;
......
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