[vlc-commits] Remove VLC_OBJECT_AOUT

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 11 17:54:02 2011 +0300| [6e394e9c206d681f9f23c1019e91f5cfc1782187] | committer: Rémi Denis-Courmont

Remove VLC_OBJECT_AOUT

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e394e9c206d681f9f23c1019e91f5cfc1782187
---

 include/vlc_objects.h     |    1 -
 src/audio_output/common.c |    4 ++--
 src/input/input.c         |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 4ba8fc9..31cd5dc 100644
--- 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 ecd99f8..1a9e5e2 100644
--- 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 0094846..2d5b14f 100644
--- 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;