Commit 2709abbb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove VLC_OBJECT_SOUT

parent a0329834
......@@ -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 */
......
......@@ -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 );
......
......@@ -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" },
......
......@@ -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";
......
......@@ -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 );
......
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