Commit 182f9a35 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove SPU type

parent e19cbb78
......@@ -59,7 +59,7 @@
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_SPU (-24)
#define VLC_OBJECT_SD (-26)
#define VLC_OBJECT_XML (-27)
......
......@@ -128,7 +128,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_STREAM, "stream" },
{ VLC_OBJECT_OPENGL, "opengl" },
{ VLC_OBJECT_FILTER, "filter" },
{ VLC_OBJECT_SPU, "spu" },
{ VLC_OBJECT_SD, "sd" },
{ VLC_OBJECT_XML, "xml" },
{ VLC_OBJECT_OSDMENU, "osdmenu" },
......
......@@ -302,10 +302,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(vout_thread_t);
psz_type = "video output";
break;
case VLC_OBJECT_SPU:
i_size = sizeof(spu_t);
psz_type = "subpicture";
break;
case VLC_OBJECT_AOUT:
i_size = sizeof(aout_instance_t);
psz_type = "audio output";
......
......@@ -76,7 +76,8 @@ enum {
spu_t *__spu_Create( vlc_object_t *p_this )
{
int i_index;
spu_t *p_spu = vlc_object_create( p_this, VLC_OBJECT_SPU );
spu_t *p_spu = vlc_custom_create( p_this, sizeof( spu_t ),
VLC_OBJECT_GENERIC, "subpicture" );
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
{
......
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