lua/intf: Fix a memleak.

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

diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp
index 20f04734f78c3cfb0a3ccc3c6981e8729d11e64c..1fc4c97d70c37838bcb50320c753d64ac88f144a 100644 (file)
--- a/modules/audio_filter/spatializer/spatializer.cpp
+++ b/modules/audio_filter/spatializer/spatializer.cpp
@@ -2,11 +2,11 @@
  * spatializer.cpp:
  *****************************************************************************
  * Copyright (C) 2004, 2006, 2007 the VideoLAN team
- * 
+ *
  * Google Summer of Code 2007
- * 
- * Authors: Biodun Osunkunle <biodun@videolan.org> 
- * 
+ *
+ * Authors: Biodun Osunkunle <biodun@videolan.org>
+ *
  * Mentor : Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -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,12 +67,12 @@ vlc_module_end();
 typedef struct aout_filter_sys_t
 {
     /* reverb static config */
-    vlc_bool_t b_first;
-    
+    bool b_first;
+
 } aout_filter_sys_t;
 
 static revmodel reverbm;
-    
+
 static const char *psz_control_names[] =
 {
     "Roomsize", "Width" , "Wet", "Dry", "Damp"
@@ -88,7 +93,8 @@ static int DryCallback ( vlc_object_t *, char const *,
 static int DampCallback ( vlc_object_t *, char const *,
                                            vlc_value_t, vlc_value_t, void * );
 static int WidthCallback ( vlc_object_t *, char const *,
-                                           vlc_value_t, vlc_value_t, void * );                                                                                                                                 
+                                           vlc_value_t, vlc_value_t, void * );
+
 /*****************************************************************************
  * Open:
  *****************************************************************************/
@@ -96,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" );
@@ -121,9 +127,9 @@ static int Open( vlc_object_t *p_this )
     }
 
     p_filter->pf_do_work = DoWork;
-    p_filter->b_in_place = VLC_TRUE;
-    
-     /* Allocate structure */    
+    p_filter->b_in_place = true;
+
+     /* Allocate structure */
     p_sys = p_filter->p_sys = (aout_filter_sys_t*)malloc( sizeof( aout_filter_sys_t ) );
     reverbm.setroomsize(1.05);
     reverbm.setwet(10.0f);
@@ -131,14 +137,14 @@ static int Open( vlc_object_t *p_this )
     reverbm.setdamp(0.3);
     reverbm.setwidth(0.9);
     SpatInit( p_filter);
-    
+
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
  * Close: close the plugin
  *****************************************************************************/
-static void Close( vlc_object_t *p_this ) 
+static void Close( vlc_object_t *p_this )
 {
     aout_filter_t     *p_filter = (aout_filter_t *)p_this;
     aout_filter_sys_t *p_sys = p_filter->p_sys;
@@ -169,7 +175,7 @@ static int SpatInit( aout_filter_t *p_filter )
     int i, ch;
     vlc_value_t val1, val2, val3, val4, val5;
     aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
-    
+
     for( int i = 0; i < 5 ; i ++ )
     {
      var_CreateGetFloatCommand( p_aout, psz_control_names[i] );
@@ -195,7 +201,7 @@ static int SpatInit( aout_filter_t *p_filter )
     var_AddCallback( p_aout, psz_control_names[2], WetCallback, p_sys );
     var_AddCallback( p_aout, psz_control_names[3], DryCallback, p_sys );
     var_AddCallback( p_aout, psz_control_names[4], DampCallback, p_sys );
-    
+
     return VLC_SUCCESS;
 }
 
@@ -210,7 +216,7 @@ static void SpatFilter( aout_instance_t *p_aout,
         {
             in[ch] = in[ch] * SPAT_AMP;
         }
-          reverbm.processreplace( in, out , 1, i_channels);
+           reverbm.processreplace( in, out , 1, i_channels);
          in  += i_channels;
          out += i_channels;
     }
@@ -236,7 +242,7 @@ static void SpatClean( aout_filter_t *p_filter )
 static int RoomCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
-    msg_Dbg (p_this,"room callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);    
+    msg_Dbg (p_this,"room callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
     reverbm.setroomsize(newval.f_float);
     return VLC_SUCCESS;
 }