Commit 6e394e9c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove VLC_OBJECT_AOUT

Audio output is not a descendent of input thread, so there was no real
use for this object type anymore.
parent e822e3f9
......@@ -35,7 +35,6 @@
#define VLC_OBJECT_INPUT (-7)
#define VLC_OBJECT_DECODER (-8)
#define VLC_OBJECT_VOUT (-9)
#define VLC_OBJECT_AOUT (-10)
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)
......
......@@ -51,8 +51,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
aout_instance_t * p_aout;
/* Allocate descriptor. */
p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT,
"audio output" );
p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ),
VLC_OBJECT_GENERIC, "audio output" );
if( p_aout == NULL )
{
return NULL;
......
......@@ -296,7 +296,7 @@ static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj )
/* FIXME ObjectKillChildrens seems a very bad idea in fact */
i = vlc_internals( p_obj )->i_object_type;
if( i == VLC_OBJECT_VOUT ||i == VLC_OBJECT_AOUT ||
if( i == VLC_OBJECT_VOUT ||
p_obj == VLC_OBJECT(p_input->p->p_sout) ||
i == VLC_OBJECT_DECODER )
return;
......
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