Remove SPU type

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 400bbc828b6666f1109dcce703dd72b7b1a3bdc2..1511427ffdfe4ed411c51378decea3624c5212c3 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -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)

diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index 75481cc92287e150540fbc38e95a84e25b1c96b1..bf53676ff4999a37e09987e7618d3f4c3b664194 100644 (file)
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -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" },

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 74fa15cc54028d77f72052a63078e110a6ef8172..b1d4aea991db473c0985a5290140ca41595a7291 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -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";

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 6531492e1daaa2947a05a931b436cdca2bccde0a..d9065dfe12706a26efffd275b1191d6f9b79566b 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -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++)
     {