From 2aa61dc55a77f535c3e70104b6ec2167766f8499 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 5 Nov 2009 23:40:23 +0200 Subject: [PATCH] Rename audio filter2 capability back to audio filter --- NEWS | 1 - modules/audio_filter/channel_mixer/dolby.c | 2 +- modules/audio_filter/channel_mixer/headphone.c | 2 +- modules/audio_filter/channel_mixer/mono.c | 2 +- modules/audio_filter/channel_mixer/simple.c | 2 +- modules/audio_filter/channel_mixer/trivial.c | 2 +- modules/audio_filter/chorus_flanger.c | 2 +- modules/audio_filter/converter/a52tofloat32.c | 2 +- modules/audio_filter/converter/a52tospdif.c | 2 +- modules/audio_filter/converter/dtstofloat32.c | 2 +- modules/audio_filter/converter/dtstospdif.c | 2 +- modules/audio_filter/converter/fixed.c | 6 +++--- modules/audio_filter/converter/float.c | 2 +- modules/audio_filter/converter/format.c | 2 +- modules/audio_filter/converter/mpgatofixed32.c | 2 +- modules/audio_filter/converter/neon.c | 2 +- modules/audio_filter/equalizer.c | 2 +- modules/audio_filter/normvol.c | 2 +- modules/audio_filter/param_eq.c | 2 +- modules/audio_filter/resampler/bandlimited.c | 4 ++-- modules/audio_filter/resampler/linear.c | 2 +- modules/audio_filter/resampler/trivial.c | 2 +- modules/audio_filter/resampler/ugly.c | 2 +- modules/audio_filter/scaletempo.c | 2 +- modules/audio_filter/spatializer/spatializer.cpp | 2 +- modules/stream_out/transcode.c | 6 +++--- src/audio_output/filters.c | 2 +- src/audio_output/input.c | 4 ++-- 28 files changed, 33 insertions(+), 34 deletions(-) diff --git a/NEWS b/NEWS index 1efda234c2..fb00ebacac 100644 --- a/NEWS +++ b/NEWS @@ -31,7 +31,6 @@ Audio filters: * 3F1R to stereo downmix filter * Dolby mixer, parameterized equalizer, trivial mixer, scaletempo, bandlimited resampler, linear resampler, ugly resampler, converter_float, converter_fixed, DTS to SPDIF and - A/52 to SPDIF filters have been upgraded to the "audio filter2" API * NEON assembly audio converter module Encoders: diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c index d6d2f0aedf..adf3399343 100644 --- a/modules/audio_filter/channel_mixer/dolby.c +++ b/modules/audio_filter/channel_mixer/dolby.c @@ -50,7 +50,7 @@ vlc_module_begin () set_shortname( N_("Dolby Surround decoder") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACODEC ) - set_capability( "audio filter2", 5 ) + set_capability( "audio filter", 5 ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index 00c85f60f3..de68586986 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -85,7 +85,7 @@ vlc_module_begin () add_bool( "headphone-dolby", false, NULL, HEADPHONE_DOLBY_TEXT, HEADPHONE_DOLBY_LONGTEXT, true ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_callbacks( OpenFilter, CloseFilter ) add_shortcut( "headphone" ) vlc_module_end () diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 7312be28cb..285d9181f0 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -106,7 +106,7 @@ static const uint32_t pi_channels_out[] = *****************************************************************************/ vlc_module_begin () set_description( N_("Audio filter for stereo to mono conversion") ) - set_capability( "audio filter2", 2 ) + set_capability( "audio filter", 2 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_callbacks( OpenFilter, CloseFilter ) diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c index 4c06bb9b07..ab0731b5ae 100644 --- a/modules/audio_filter/channel_mixer/simple.c +++ b/modules/audio_filter/channel_mixer/simple.c @@ -44,7 +44,7 @@ vlc_module_begin () set_description( N_("Audio filter for simple channel mixing") ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) - set_capability( "audio filter2", 10 ) + set_capability( "audio filter", 10 ) set_callbacks( OpenFilter, NULL ) vlc_module_end () diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c index 46bda71b09..3ecc0dd836 100644 --- a/modules/audio_filter/channel_mixer/trivial.c +++ b/modules/audio_filter/channel_mixer/trivial.c @@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * ); *****************************************************************************/ vlc_module_begin () set_description( N_("Audio filter for trivial channel mixing") ) - set_capability( "audio filter2", 1 ) + set_capability( "audio filter", 1 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_callbacks( Create, NULL ) diff --git a/modules/audio_filter/chorus_flanger.c b/modules/audio_filter/chorus_flanger.c index 7c5d8066f0..6f2c6ce743 100644 --- a/modules/audio_filter/chorus_flanger.c +++ b/modules/audio_filter/chorus_flanger.c @@ -93,7 +93,7 @@ vlc_module_begin () N_("Wet mix"), N_("Level of delayed signal"), true ) add_float_with_range( "dry-mix", 0.4, -0.999, 0.999, NULL, N_("Dry Mix"), N_("Level of input signal"), true ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c index 9f1ff32805..368931e689 100644 --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -97,7 +97,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACODEC ) add_bool( "a52-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ) add_bool( "a52-upmix", false, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true ) - set_capability( "audio filter2", 100 ) + set_capability( "audio filter", 100 ) set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c index 2ad533e930..89d2a25a2e 100644 --- a/modules/audio_filter/converter/a52tospdif.c +++ b/modules/audio_filter/converter/a52tospdif.c @@ -49,7 +49,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_description( N_("Audio filter for A/52->S/PDIF encapsulation") ) - set_capability( "audio filter2", 10 ) + set_capability( "audio filter", 10 ) set_callbacks( Create, NULL ) vlc_module_end () diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index e68bb6c9e3..a3529266cd 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -86,7 +86,7 @@ vlc_module_begin () set_shortname( "DCA" ) set_description( N_("DTS Coherent Acoustics audio decoder") ) add_bool( "dts-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ) - set_capability( "audio filter2", 100 ) + set_capability( "audio filter", 100 ) set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c index 544fc9c4b8..7d62c6d178 100644 --- a/modules/audio_filter/converter/dtstospdif.c +++ b/modules/audio_filter/converter/dtstospdif.c @@ -63,7 +63,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_description( N_("Audio filter for DTS->S/PDIF encapsulation") ) - set_capability( "audio filter2", 10 ) + set_capability( "audio filter", 10 ) set_callbacks( Create, Close ) vlc_module_end () diff --git a/modules/audio_filter/converter/fixed.c b/modules/audio_filter/converter/fixed.c index 8627deaa49..21659588f7 100644 --- a/modules/audio_filter/converter/fixed.c +++ b/modules/audio_filter/converter/fixed.c @@ -55,13 +55,13 @@ vlc_module_begin () set_description( N_("Fixed point audio format conversions") ) add_submodule () set_callbacks( Create_F32ToS16, NULL ) - set_capability( "audio filter2", 10 ) + set_capability( "audio filter", 10 ) add_submodule () set_callbacks( Create_S16ToF32, NULL ) - set_capability( "audio filter2", 15 ) + set_capability( "audio filter", 15 ) add_submodule () set_callbacks( Create_U8ToF32, NULL ) - set_capability( "audio filter2", 1 ) + set_capability( "audio filter", 1 ) vlc_module_end () /***************************************************************************** diff --git a/modules/audio_filter/converter/float.c b/modules/audio_filter/converter/float.c index 6fbe0cea39..54d90ab408 100644 --- a/modules/audio_filter/converter/float.c +++ b/modules/audio_filter/converter/float.c @@ -51,7 +51,7 @@ static block_t *Do_FL32ToF32 ( filter_t *, block_t * ); vlc_module_begin () set_description( N_("Floating-point audio format conversions") ) add_submodule () - set_capability( "audio filter2", 10 ) + set_capability( "audio filter", 10 ) set_callbacks( Create_F32ToFL32, NULL ) vlc_module_end () diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c index ee750f31cd..9c844de5d3 100644 --- a/modules/audio_filter/converter/format.c +++ b/modules/audio_filter/converter/format.c @@ -194,7 +194,7 @@ vlc_module_begin () set_description( N_("Audio filter for PCM format conversion") ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) - set_capability( "audio filter2", 1 ) + set_capability( "audio filter", 1 ) set_callbacks( Open, NULL ) vlc_module_end () diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 243b1e461e..2b63bf0abb 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -66,7 +66,7 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACODEC ) set_description( N_("MPEG audio decoder") ) - set_capability( "audio filter2", 100 ) + set_capability( "audio filter", 100 ) set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/audio_filter/converter/neon.c b/modules/audio_filter/converter/neon.c index e1c682a005..ce2441b8e1 100644 --- a/modules/audio_filter/converter/neon.c +++ b/modules/audio_filter/converter/neon.c @@ -34,7 +34,7 @@ static int Open (vlc_object_t *); vlc_module_begin () set_description (N_("ARM NEON audio format conversions") ) - set_capability ("audio filter2", 20) + set_capability ("audio filter", 20) set_callbacks (Open, NULL) add_requirement (NEON) vlc_module_end () diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 15dd08f258..8915f71aae 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -74,7 +74,7 @@ static void Close( vlc_object_t * ); vlc_module_begin () set_description( N_("Equalizer with 10 bands") ) set_shortname( N_("Equalizer" ) ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AFILTER ) diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index b2752f6dc1..90a7603b76 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -89,7 +89,7 @@ vlc_module_begin () true ) add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT, LEVEL_LONGTEXT, true ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c index 0ce26fbcd4..5dcc1aa775 100644 --- a/modules/audio_filter/param_eq.c +++ b/modules/audio_filter/param_eq.c @@ -51,7 +51,7 @@ static block_t *DoWork( filter_t *, block_t * ); vlc_module_begin () set_description( N_("Parametric Equalizer") ) set_shortname( N_("Parametric Equalizer" ) ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AFILTER ) diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c index 97ff9dc59e..d76cc15fb9 100644 --- a/modules/audio_filter/resampler/bandlimited.c +++ b/modules/audio_filter/resampler/bandlimited.c @@ -49,7 +49,7 @@ * Local prototypes *****************************************************************************/ -/* audio filter2 */ +/* audio filter */ static int OpenFilter ( vlc_object_t * ); static void CloseFilter( vlc_object_t * ); static block_t *Resample( filter_t *, block_t * ); @@ -89,7 +89,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_description( N_("Audio filter for band-limited interpolation resampling") ) - set_capability( "audio filter2", 20 ) + set_capability( "audio filter", 20 ) set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c index 130b357d36..a3c7cb3a6b 100644 --- a/modules/audio_filter/resampler/linear.c +++ b/modules/audio_filter/resampler/linear.c @@ -71,7 +71,7 @@ vlc_module_begin () set_description( N_("Audio filter for linear interpolation resampling") ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) - set_capability( "audio filter2", 5 ) + set_capability( "audio filter", 5 ) set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c index c7bb418e5f..05af9811c7 100644 --- a/modules/audio_filter/resampler/trivial.c +++ b/modules/audio_filter/resampler/trivial.c @@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * ); *****************************************************************************/ vlc_module_begin () set_description( N_("Audio filter for trivial resampling") ) - set_capability( "audio filter2", 1 ) + set_capability( "audio filter", 1 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_callbacks( Create, NULL ) diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c index 71298a0be9..fbc0772dd5 100644 --- a/modules/audio_filter/resampler/ugly.c +++ b/modules/audio_filter/resampler/ugly.c @@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * ); *****************************************************************************/ vlc_module_begin () set_description( N_("Audio filter for ugly resampling") ) - set_capability( "audio filter2", 2 ) + set_capability( "audio filter", 2 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) set_callbacks( Create, NULL ) diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c index 8c9e97487b..9e061737e4 100644 --- a/modules/audio_filter/scaletempo.c +++ b/modules/audio_filter/scaletempo.c @@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * ); vlc_module_begin () set_description( N_("Audio tempo scaler synched with rate") ) set_shortname( N_("Scaletempo") ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AFILTER ) diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp index c0857a60cd..a5260d8a2b 100644 --- a/modules/audio_filter/spatializer/spatializer.cpp +++ b/modules/audio_filter/spatializer/spatializer.cpp @@ -70,7 +70,7 @@ static void Close( vlc_object_t * ); vlc_module_begin () set_description( N_("Audio Spatializer") ) set_shortname( N_("Spatializer" ) ) - set_capability( "audio filter2", 0 ) + set_capability( "audio filter", 0 ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AFILTER ) diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index a632f12cdd..a5d60af2a9 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -215,7 +215,7 @@ vlc_module_begin () ARATE_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "audio-sync", false, NULL, ASYNC_TEXT, ASYNC_LONGTEXT, false ) - add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2", + add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter", NULL, NULL, AFILTER_TEXT, AFILTER_LONGTEXT, false ) @@ -1239,7 +1239,7 @@ static int transcode_audio_new( sout_stream_t *p_stream, } fmt_last = fmt_fl32; - id->p_uf_chain = filter_chain_New( p_stream, "audio filter2", false, + id->p_uf_chain = filter_chain_New( p_stream, "audio filter", false, transcode_audio_filter_allocation_init, NULL, NULL ); filter_chain_Reset( id->p_uf_chain, &fmt_last, &fmt_fl32 ); if( filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_af2 ) > 0 ) @@ -1247,7 +1247,7 @@ static int transcode_audio_new( sout_stream_t *p_stream, } /* Load conversion filters */ - id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true, + id->p_f_chain = filter_chain_New( p_stream, "audio filter", true, transcode_audio_filter_allocation_init, NULL, NULL ); filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in ); diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c index ad064b048a..19727ff880 100644 --- a/src/audio_output/filters.c +++ b/src/audio_output/filters.c @@ -68,7 +68,7 @@ static filter_t * FindFilter( aout_instance_t * p_aout, p_filter->fmt_out.i_codec = p_output_format->i_format; p_filter->pf_audio_buffer_new = aout_FilterBufferNew; - p_filter->p_module = module_need( p_filter, "audio filter2", NULL, false ); + p_filter->p_module = module_need( p_filter, "audio filter", NULL, false ); if ( p_filter->p_module == NULL ) { vlc_object_detach( p_filter ); diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 45aa96a5a8..dd279cb761 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -305,7 +305,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ } else /* this can be a audio filter module as well as a visualization module */ { - p_filter->p_module = module_need( p_filter, "audio filter2", + p_filter->p_module = module_need( p_filter, "audio filter", psz_parser, true ); if ( p_filter->p_module == NULL ) @@ -319,7 +319,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ aout_FormatPrepare( &p_filter->fmt_in.audio ); aout_FormatPrepare( &p_filter->fmt_out.audio ); p_filter->p_module = module_need( p_filter, - "audio filter2", + "audio filter", psz_parser, true ); } /* try visual filters */ -- 2.39.2