Remove VLC_OBJECT_VOUT

(Same reasons as VLC_OBJECT_AOUT)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 31cd5dc3a8b1ff96041bebc08a2bac26ff98b7eb..bb08efbe933291c7fe5eec251e40625031e24b77 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -34,7 +34,6 @@
 /* Object types */
 #define VLC_OBJECT_INPUT       (-7)
 #define VLC_OBJECT_DECODER     (-8)
-#define VLC_OBJECT_VOUT        (-9)
 /* 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/input.c b/src/input/input.c
index 2d5b14f790ae8ab97333b2d77a71ece70b75d704..a7918fb4af323122210632a9e16e3b32fbab63ad 100644 (file)
--- 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( i == VLC_OBJECT_VOUT ||
-        p_obj == VLC_OBJECT(p_input->p->p_sout) ||
+    if( p_obj == VLC_OBJECT(p_input->p->p_sout) ||
         i == VLC_OBJECT_DECODER )
         return;
 

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 48aad9013b86d83cd7ec853e586c5f08be0ffc70..2f6c53806c3170e9bc77c80756e9b663094b2678 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -120,7 +120,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
     /* Allocate descriptor */
     vout_thread_t *vout = vlc_custom_create(object,
                                             sizeof(*vout) + sizeof(*vout->p),
-                                            VLC_OBJECT_VOUT, "video output");
+                                            VLC_OBJECT_GENERIC, "video output");
     if (!vout) {
         video_format_Clean(&original);
         return NULL;