Fix commit.

[vlc] / modules / audio_filter / spatializer / spatializer.cpp

diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp
index f4243948ad6862365f8013c993ec9580f8cd3f92..1fc4c97d70c37838bcb50320c753d64ac88f144a 100644 (file)
--- a/modules/audio_filter/spatializer/spatializer.cpp
+++ b/modules/audio_filter/spatializer/spatializer.cpp
@@ -30,7 +30,12 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <math.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include "vlc_aout.h"
 #include "revmodel.hpp"
 #define SPAT_AMP 0.3
@@ -41,19 +46,19 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("spatializer") );
-    set_shortname( _("spatializer" ) );
+    set_description( N_("spatializer") );
+    set_shortname( N_("spatializer" ) );
     set_capability( "audio filter", 0 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );
 
     set_callbacks( Open, Close );
     add_shortcut( "spatializer" );
-    add_float( "Roomsize", 1.05, NULL, NULL,NULL, VLC_TRUE);
-    add_float( "Width", 10.0, NULL, NULL,NULL, VLC_TRUE);
-    add_float( "Wet", 3.0, NULL, NULL,NULL, VLC_TRUE);
-    add_float( "Dry", 2.0, NULL, NULL,NULL, VLC_TRUE);
-    add_float( "Damp", 1.0, NULL, NULL,NULL, VLC_TRUE);
+    add_float( "Roomsize", 1.05, NULL, NULL,NULL, true);
+    add_float( "Width", 10.0, NULL, NULL,NULL, true);
+    add_float( "Wet", 3.0, NULL, NULL,NULL, true);
+    add_float( "Dry", 2.0, NULL, NULL,NULL, true);
+    add_float( "Damp", 1.0, NULL, NULL,NULL, true);
 vlc_module_end();
 
 /*****************************************************************************
@@ -62,7 +67,7 @@ vlc_module_end();
 typedef struct aout_filter_sys_t
 {
     /* reverb static config */
-    vlc_bool_t b_first;
+    bool b_first;
 
 } aout_filter_sys_t;
 
@@ -97,20 +102,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;
     msg_Dbg(p_this, "Opening filter spatializer %s %s %d\n", __FILE__,__func__,__LINE__);
 
     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" );
@@ -122,7 +127,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 = (aout_filter_sys_t*)malloc( sizeof( aout_filter_sys_t ) );