Rename audio filter2 capability back to audio filter

diff --git a/NEWS b/NEWS
index 1efda234c232b4e544c30089d9e38192976f0c98..fb00ebacac0e1da61fb4531dfd9b90cc61ba4d7b 100644 (file)
--- 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 d6d2f0aedf5280de509a2ded70528cdb21a603dd..adf3399343d30e8cec0dcac33cce2eefff502d8c 100644 (file)
--- 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 00c85f60f33c0f1c4189c03ce021662f35779151..de6858698635f3cee4f8d214123aa29aee17cd31 100644 (file)
--- 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 7312be28cbdbbd8ee3c4b04e02c5329fe8fca0ba..285d9181f0a70a7adfd938dc7f761aab85cddb48 100644 (file)
--- 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 4c06bb9b07862a8aa97a56a51972d4b7b4dc6940..ab0731b5ae016f3fdb04b86bcd98491b63f11aea 100644 (file)
--- 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 46bda71b0988aebe0ee75f452791e3aa3b099169..3ecc0dd8363a50c40f7f123a9e2724a943c0c83c 100644 (file)
--- 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 7c5d8066f0ed44eb4490c2bd6713852472b91fab..6f2c6ce7439df9e0afae63e6708489c96a31b2f7 100644 (file)
--- 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 9f1ff32805b82ab37c665f4e5e15272a43b80a71..368931e689cd79a1cccba8ea6f4b6cbebf27b9d2 100644 (file)
--- 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 2ad533e9307e94b197675ea49f696de3ee6f4b85..89d2a25a2ec08921663f3f9510ef590773db140c 100644 (file)
--- 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 e68bb6c9e3c4fcd077a2d522edc0a9111f07cafb..a3529266cd080a2fa8c3acf68ffe11bf2ff00d02 100644 (file)
--- 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 544fc9c4b83ba9695a6933178784de71a1466b8f..7d62c6d178c6c255535989f72dc47a4c695287c1 100644 (file)
--- 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 8627deaa49c705f00ce22265f58827339f439d8d..21659588f74a9501ce5d0e12c625c7b9eaf4b826 100644 (file)
--- 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 6fbe0cea39a7446ced3ec482f5cba22d3b66af78..54d90ab408a8fa0ea9e390c9483b76efa7109655 100644 (file)
--- 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 ee750f31cd6f0c4d58c31135f15dc3bcebe79864..9c844de5d3d575db002a30c1b39012497c41425f 100644 (file)
--- 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 243b1e461ec8d8f30adb252916b2434ecd7e5058..2b63bf0abb74d60ae6d1684008b5c7c2995d71c5 100644 (file)
--- 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 e1c682a00513058a8b4d4486d36eeb1a05b3f0b6..ce2441b8e18e7e0ab1a049ee776b7b6119420f89 100644 (file)
--- 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 15dd08f2580c4f3833655bca56b6672a3497c330..8915f71aae5a94a9514c81b8ba73ba7c28aa44a8 100644 (file)
--- 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 b2752f6dc13672287d3370474076ead619069cce..90a7603b7657189f8bc529f78e8178c490d8c07e 100644 (file)
--- 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 0ce26fbcd4ebaae395049610723be27f7123af0a..5dcc1aa7751e4d4f0a0b0a3228710c87046ad116 100644 (file)
--- 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 97ff9dc59e8ba271a7063c3cf29187f1a167cb31..d76cc15fb95c6f729f29b310a42dc88e90c2e0ad 100644 (file)
--- 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 130b357d36f5f8c3f34d82bba70243b9215a2ede..a3c7cb3a6b4d9404763df05dff77a9b009a3b901 100644 (file)
--- 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 c7bb418e5fc6fce20a19d5a1db750ba3569de26e..05af9811c7d70e4c1d95fa183059d44140efdd22 100644 (file)
--- 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 71298a0be99d519a0c233eef8183c2f05694596e..fbc0772dd59e6d43a4bd938558ae613c21dcfe64 100644 (file)
--- 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 8c9e97487b61782440cb524fcb3f47ed54b2416e..9e061737e4a177e0f9acb14a258700b83aaa22ff 100644 (file)
--- 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 c0857a60cd0eba05f83a060686247ff2566680eb..a5260d8a2bc15e8d1a76da2cea20e08be478143e 100644 (file)
--- 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 a632f12cdd80d14b21993e14cffdc75d82ba7247..a5d60af2a9f4c9ba952bb6cc0610f7752a9fdb76 100644 (file)
--- 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 ad064b048aea3e933ddd101ee7a1a12d88f5b2fa..19727ff8802f7121fef00dc86315e2d3b28595e3 100644 (file)
--- 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 45aa96a5a8096bef669175e618475bcca74a83e0..dd279cb76171ca1e01abd1dd612844da71741a09 100644 (file)
--- 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 */