vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Jul 11 17:56:44 2011 +0300| [f8b3ccc7f58e23b99b436cdd327993e88d691b03] | committer: Rémi Denis-Courmont
Remove VLC_OBJECT_VOUT (Same reasons as VLC_OBJECT_AOUT) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f8b3ccc7f58e23b99b436cdd327993e88d691b03 --- include/vlc_objects.h | 1 - src/input/input.c | 3 +-- src/video_output/video_output.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 31cd5dc..bb08efb 100644 --- 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 2d5b14f..a7918fb 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( 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 48aad90..2f6c538 100644 --- 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; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
