Remove VLC_OBJECT_SOUT

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 1a9d329bdf0a0edca328f479dcef8d99b53947db..81ee3fdeed937a228c144c7281e44714bb2cb8f2 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -36,39 +36,28 @@
  */
 
 /* Object types */
-
 #define VLC_OBJECT_LIBVLC      (-2)
 #define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
 #define VLC_OBJECT_PLAYLIST    (-5)
-
 #define VLC_OBJECT_INPUT       (-7)
 #define VLC_OBJECT_DECODER     (-8)
 #define VLC_OBJECT_VOUT        (-9)
 #define VLC_OBJECT_AOUT        (-10)
-#define VLC_OBJECT_SOUT        (-11)
-
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
 #define VLC_OBJECT_DIALOGS     (-15)
-
 #define VLC_OBJECT_ANNOUNCE    (-17)
 #define VLC_OBJECT_DEMUX       (-18)
 #define VLC_OBJECT_ACCESS      (-19)
 #define VLC_OBJECT_STREAM      (-20)
 #define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_FILTER      (-22)
-
-
-
-
-
 #define VLC_OBJECT_OSDMENU     (-28)
-
 #define VLC_OBJECT_HTTPD_HOST  (-30)
-
 #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)
 
 /* Object search mode */

diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c
index 2f226c6d275520870b4a23c33e98b5fcbdaabde0..982d4556b8af059df19b6f33d6187e1b1795fca9 100644 (file)
--- a/modules/control/http/rpn.c
+++ b/modules/control/http/rpn.c
@@ -52,8 +52,6 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf,
         i_object_type = VLC_OBJECT_VOUT;
     else if( !strcmp( psz_object, "VLC_OBJECT_AOUT" ) )
         i_object_type = VLC_OBJECT_AOUT;
-    else if( !strcmp( psz_object, "VLC_OBJECT_SOUT" ) )
-        i_object_type = VLC_OBJECT_SOUT;
     else
         msg_Warn( p_intf, "unknown object type (%s)", psz_object );
 

diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index fca5b0d45c3e24ade16a92dd2686e48bdaa72e45..98cc772951d9b5c94f50870584c4ebb1884d23c4 100644 (file)
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -115,7 +115,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_DECODER, "decoder" },
           { VLC_OBJECT_VOUT, "vout" },
           { VLC_OBJECT_AOUT, "aout" },
-          { VLC_OBJECT_SOUT, "sout" },
           { VLC_OBJECT_PACKETIZER, "packetizer" },
           { VLC_OBJECT_ENCODER, "encoder" },
           { VLC_OBJECT_DIALOGS, "dialogs" },

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 52d32469993fc509e042a3bebb7989015657e353..b3829de135c6dfb07e5a6db501dc00e628624db4 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(aout_instance_t);
             psz_type = "audio output";
             break;
-        case VLC_OBJECT_SOUT:
-            i_size = sizeof(sout_instance_t);
-            psz_type = "stream output";
-            break;
         case VLC_OBJECT_OPENGL:
             i_size = sizeof( vout_thread_t );
             psz_type = "opengl";

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index c018afc7751f43f2ec68021fb029a11cf0ab81cf..27592d30609e61a76fbd6a0da7d3bfcf32ddeb68 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -76,15 +76,14 @@ static void mrl_Clean( mrl_t *p_mrl );
  *****************************************************************************/
 sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
 {
+    static const char typename[] = "stream output";
     sout_instance_t *p_sout;
 
     /* *** Allocate descriptor *** */
-    p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
+    p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ),
+                                VLC_OBJECT_GENERIC, typename );
     if( p_sout == NULL )
-    {
-        msg_Err( p_parent, "out of memory" );
         return NULL;
-    }
 
     /* *** init descriptor *** */
     p_sout->psz_sout    = strdup( psz_dest );