[vlc-commits] Remove VLC_OBJECT_DECODER type

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 11 18:12:16 2011 +0300| [54526620231f4a178d26a1a4cea6ed0f5b6cac6c] | committer: Rémi Denis-Courmont

Remove VLC_OBJECT_DECODER type

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

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

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index bb08efb..fb706ad 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -33,7 +33,6 @@
 
 /* Object types */
 #define VLC_OBJECT_INPUT       (-7)
-#define VLC_OBJECT_DECODER     (-8)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 02385a0..977ccb7 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -750,7 +750,7 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
     decoder_owner_sys_t *p_owner;
     es_format_t null_es_format;
 
-    p_dec = vlc_custom_create( p_parent, sizeof( *p_dec ), VLC_OBJECT_DECODER,
+    p_dec = vlc_custom_create( p_parent, sizeof( *p_dec ), VLC_OBJECT_GENERIC,
                                "decoder" );
     if( p_dec == NULL )
         return NULL;
@@ -827,7 +827,7 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
     {
         p_owner->p_packetizer =
             vlc_custom_create( p_parent, sizeof( decoder_t ),
-                               VLC_OBJECT_DECODER, "packetizer" );
+                               VLC_OBJECT_GENERIC, "packetizer" );
         if( p_owner->p_packetizer )
         {
             es_format_Copy( &p_owner->p_packetizer->fmt_in,
diff --git a/src/input/input.c b/src/input/input.c
index a7918fb..3f0bab6 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -296,8 +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( p_obj == VLC_OBJECT(p_input->p->p_sout) ||
-        i == VLC_OBJECT_DECODER )
+    if( p_obj == VLC_OBJECT(p_input->p->p_sout) )
         return;
 
     vlc_object_kill( p_obj );