Fix preferences for jack (avoid the double 'pace' text)

[vlc] / modules / audio_filter / param_eq.c

diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index c1b957544e45d47cd4fccc5900a063f4ae6073ca..53c000f0e739162ef0f43e7db13c07b2bdcc4729 100644 (file)
--- a/modules/audio_filter/param_eq.c
+++ b/modules/audio_filter/param_eq.c
@@ -25,13 +25,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <math.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 
 /*****************************************************************************
@@ -46,33 +48,33 @@ static void DoWork( aout_instance_t *, aout_filter_t *,
                     aout_buffer_t *, aout_buffer_t * );
 
 vlc_module_begin();
-    set_description( _("Parametric Equalizer") );
-    set_shortname( _("Parametric Equalizer" ) );
+    set_description( N_("Parametric Equalizer") );
+    set_shortname( N_("Parametric Equalizer" ) );
     set_capability( "audio filter", 0 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );
 
-    add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", VLC_FALSE );
+    add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", false );
     add_float_with_range( "param-eq-lowgain", 0, -20.0, 20.0, NULL,
-                          N_("Low freq gain (dB)"), "",VLC_FALSE );
-    add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", VLC_FALSE );
+                          N_("Low freq gain (dB)"), "",false );
+    add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", false );
     add_float_with_range( "param-eq-highgain", 0, -20.0, 20.0, NULL,
-                          N_("High freq gain (dB)"),"",VLC_FALSE );
-    add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", VLC_FALSE );
+                          N_("High freq gain (dB)"),"",false );
+    add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", false );
     add_float_with_range( "param-eq-gain1", 0, -20.0, 20.0, NULL,
-                          N_("Freq 1 gain (dB)"), "",VLC_FALSE );
+                          N_("Freq 1 gain (dB)"), "",false );
     add_float_with_range( "param-eq-q1", 3, 0.1, 100.0, NULL,
-                          N_("Freq 1 Q"), "",VLC_FALSE );
-    add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", VLC_FALSE );
+                          N_("Freq 1 Q"), "",false );
+    add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", false );
     add_float_with_range( "param-eq-gain2", 0, -20.0, 20.0, NULL,
-                          N_("Freq 2 gain (dB)"),"",VLC_FALSE );
+                          N_("Freq 2 gain (dB)"),"",false );
     add_float_with_range( "param-eq-q2", 3, 0.1, 100.0, NULL,
-                          N_("Freq 2 Q"),"",VLC_FALSE );
-    add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", VLC_FALSE );
+                          N_("Freq 2 Q"),"",false );
+    add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", false );
     add_float_with_range( "param-eq-gain3", 0, -20.0, 20.0, NULL,
-                          N_("Freq 3 gain (dB)"),"",VLC_FALSE );
+                          N_("Freq 3 gain (dB)"),"",false );
     add_float_with_range( "param-eq-q3", 3, 0.1, 100.0, NULL,
-                          N_("Freq 3 Q"),"",VLC_FALSE );
+                          N_("Freq 3 Q"),"",false );
 
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -105,20 +107,20 @@ static int Open( vlc_object_t *p_this )
 {
     aout_filter_t     *p_filter = (aout_filter_t *)p_this;
     aout_filter_sys_t *p_sys;
-    vlc_bool_t         b_fit = VLC_TRUE;
+    bool         b_fit = true;
     int                i_samplerate;
 
     if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
         p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
         p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
         msg_Warn( p_filter, "bad input or output format" );
     }
     if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         memcpy( &p_filter->output, &p_filter->input,
                 sizeof(audio_sample_format_t) );
         msg_Warn( p_filter, "input and output formats are not similar" );
@@ -130,7 +132,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     p_filter->pf_do_work = DoWork;
-    p_filter->b_in_place = VLC_TRUE;
+    p_filter->b_in_place = true;
 
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
@@ -185,6 +187,7 @@ static void Close( vlc_object_t *p_this )
 static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
+    VLC_UNUSED(p_aout);
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
     p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;