From c2c6729b7abd3a0d1096c79251a6d05a2e9a3403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 28 Jun 2008 21:46:26 +0300 Subject: [PATCH] VLC_OBJECT_FILTER: remove --- include/vlc_objects.h | 1 - modules/gui/fbosd.c | 4 ++-- modules/misc/lua/libs/objects.c | 1 - modules/video_filter/blendbench.c | 2 +- modules/video_filter/chain.c | 2 +- src/misc/filter_chain.c | 2 +- src/misc/image.c | 2 +- src/misc/objects.c | 4 ---- src/video_output/video_output.c | 2 +- src/video_output/vout_subpictures.c | 6 +++--- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 331634af7e..a027dd9b34 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -44,7 +44,6 @@ #define VLC_OBJECT_ENCODER (-14) #define VLC_OBJECT_ANNOUNCE (-17) #define VLC_OBJECT_OPENGL (-21) -#define VLC_OBJECT_FILTER (-22) #define VLC_OBJECT_OSDMENU (-28) /* Please add new object types below -34 */ /* Please do not add new object types anyway */ diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index b861e87549..c165af633f 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -533,7 +533,7 @@ static int OpenBlending( intf_thread_t *p_intf ) if( p_intf->p_sys->p_blend ) return VLC_EGENERIC; p_intf->p_sys->p_blend = - vlc_object_create( p_intf, VLC_OBJECT_FILTER ); + vlc_object_create( p_intf, sizeof(filter_t) ); vlc_object_attach( p_intf->p_sys->p_blend, p_intf ); p_intf->p_sys->p_blend->fmt_out.video.i_x_offset = p_intf->p_sys->p_blend->fmt_out.video.i_y_offset = 0; @@ -578,7 +578,7 @@ static int OpenTextRenderer( intf_thread_t *p_intf ) if( p_intf->p_sys->p_text ) return VLC_EGENERIC; p_intf->p_sys->p_text = - vlc_object_create( p_intf, VLC_OBJECT_FILTER ); + vlc_object_create( p_intf, sizeof(filter_t) ); vlc_object_attach( p_intf->p_sys->p_text, p_intf ); p_intf->p_sys->p_text->fmt_out.video.i_width = diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c index 2166657a54..0452204972 100644 --- a/modules/misc/lua/libs/objects.c +++ b/modules/misc/lua/libs/objects.c @@ -100,7 +100,6 @@ static int vlc_object_type_from_string( const char *psz_name ) { VLC_OBJECT_ENCODER, "encoder" }, { VLC_OBJECT_ANNOUNCE, "announce" }, { VLC_OBJECT_OPENGL, "opengl" }, - { VLC_OBJECT_FILTER, "filter" }, { VLC_OBJECT_OSDMENU, "osdmenu" }, { VLC_OBJECT_GENERIC, "generic" }, { 0, "" } }; diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c index 08e350fc85..d5a547ee77 100644 --- a/modules/video_filter/blendbench.c +++ b/modules/video_filter/blendbench.c @@ -215,7 +215,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if( p_sys->b_done ) return p_pic; - p_blend = vlc_object_create( p_filter, VLC_OBJECT_FILTER ); + p_blend = vlc_object_create( p_filter, sizeof(filter_t) ); if( !p_blend ) { p_pic->pf_release( p_pic ); diff --git a/modules/video_filter/chain.c b/modules/video_filter/chain.c index dd65f08c14..c39fccaacb 100644 --- a/modules/video_filter/chain.c +++ b/modules/video_filter/chain.c @@ -87,7 +87,7 @@ static void DeleteFilter( filter_t *p_filter ) static filter_t *CreateFilter( vlc_object_t *p_this, video_format_t *fmt_in, video_format_t *fmt_out ) { - filter_t *p_filter = vlc_object_create( p_this, VLC_OBJECT_FILTER ); + filter_t *p_filter = vlc_object_create( p_this, sizeof(filter_t) ); vlc_object_attach( p_filter, p_this ); p_filter->pf_vout_buffer_new = get_pic; diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index e59e0b6098..4c7e4f3298 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -133,7 +133,7 @@ static filter_t *filter_chain_AppendFilterInternal( filter_chain_t *p_chain, const es_format_t *p_fmt_out ) { filter_t *p_filter = - vlc_object_create( p_chain->p_this, VLC_OBJECT_FILTER ); + vlc_object_create( p_chain->p_this, sizeof(filter_t) ); if( !p_filter ) return NULL; vlc_object_attach( p_filter, p_chain->p_this ); diff --git a/src/misc/image.c b/src/misc/image.c index 5a1a80fce8..1163b28cf3 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -751,7 +751,7 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, { filter_t *p_filter; - p_filter = vlc_object_create( p_this, VLC_OBJECT_FILTER ); + p_filter = vlc_object_create( p_this, sizeof(filter_t) ); vlc_object_attach( p_filter, p_this ); p_filter->pf_vout_buffer_new = diff --git a/src/misc/objects.c b/src/misc/objects.c index 68dab87422..ba58f71bfd 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -242,10 +242,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) i_size = sizeof(encoder_t); psz_type = "encoder"; break; - case VLC_OBJECT_FILTER: - i_size = sizeof(filter_t); - psz_type = "filter"; - break; case VLC_OBJECT_AOUT: i_size = sizeof(aout_instance_t); psz_type = "audio output"; diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index ff29b2783b..f86a509124 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -655,7 +655,7 @@ static int InitThread( vout_thread_t *p_vout ) p_vout->b_direct = 0; /* Choose the best module */ - p_vout->p_chroma = vlc_object_create( p_vout, VLC_OBJECT_FILTER ); + p_vout->p_chroma = vlc_object_create( p_vout, sizeof(filter_t) ); filter_t *p_chroma = p_vout->p_chroma; vlc_object_attach( p_chroma, p_vout ); /* TODO: Set the fmt_in and fmt_out stuff here */ diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 70e81c2af2..5fec349534 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -527,7 +527,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, /* Load the blending module */ if( !p_spu->p_blend && p_region ) { - p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER ); + p_spu->p_blend = vlc_object_create( p_spu, sizeof(filter_t) ); vlc_object_attach( p_spu->p_blend, p_spu ); p_spu->p_blend->fmt_out.video.i_x_offset = p_spu->p_blend->fmt_out.video.i_y_offset = 0; @@ -548,7 +548,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, { char *psz_modulename = NULL; - p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER ); + p_spu->p_text = vlc_object_create( p_spu, sizeof(filter_t) ); vlc_object_attach( p_spu->p_text, p_spu ); p_spu->p_text->fmt_out.video.i_width = @@ -690,7 +690,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, (((pi_scale_width[ SCALE_DEFAULT ] > 0) || (pi_scale_height[ SCALE_DEFAULT ] > 0)) && ((pi_scale_width[ SCALE_DEFAULT ] != 1000) || (pi_scale_height[ SCALE_DEFAULT ] != 1000)))) ) { - p_spu->p_scale = vlc_object_create( p_spu, VLC_OBJECT_FILTER ); + p_spu->p_scale = vlc_object_create( p_spu, sizeof(filter_t)); vlc_object_attach( p_spu->p_scale, p_spu ); p_spu->p_scale->fmt_out.video.i_chroma = p_spu->p_scale->fmt_in.video.i_chroma = -- 2.39.5