Remove VLC_OBJECT_AOUT

Audio output is not a descendent of input thread, so there was no real
use for this object type anymore.

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 4ba8fc9e6c982b9814d7b7159599a0ec9500232b..31cd5dc3a8b1ff96041bebc08a2bac26ff98b7eb 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -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)

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index ecd99f888b5af7f19c047a8382a0d250fe448ebf..1a9e5e26ce35e2ca90e641a399dabbfa15b18739 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -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;

diff --git a/src/input/input.c b/src/input/input.c
index 0094846a61eb8528179ca959415a9522e776e3b2..2d5b14f790ae8ab97333b2d77a71ece70b75d704 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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;