X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faudio_filter%2Fchannel_mixer%2Fheadphone.c;h=d542e4785335400af3f1e45ff4786ac11255ef01;hb=2ea3b5fc8afa530afc65d520b33ef7edc354f775;hp=5c635faa57ba0c3c2f95438d893c5e58c2c9acc3;hpb=806cf5165824be921bf2402ecf11fd3ee6501f9c;p=vlc

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 5c635faa57..d542e47853 100644
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -27,6 +27,10 @@
  *****************************************************************************/
 #include <math.h>                                        /* sqrt */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_aout.h>
 #include <vlc_filter.h>
@@ -80,14 +84,11 @@ vlc_module_begin();
     set_subcategory( SUBCAT_AUDIO_AFILTER );
 
     add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT,
-                 HEADPHONE_DIM_LONGTEXT, VLC_FALSE );
-        change_safe();
+                 HEADPHONE_DIM_LONGTEXT, false );
     add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT,
-              HEADPHONE_COMPENSATE_LONGTEXT, VLC_TRUE );
-        change_safe();
+              HEADPHONE_COMPENSATE_LONGTEXT, true );
     add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT,
-              HEADPHONE_DOLBY_LONGTEXT, VLC_TRUE );
-        change_safe();
+              HEADPHONE_DOLBY_LONGTEXT, true );
 
     set_capability( "audio filter", 0 );
     set_callbacks( Create, Destroy );
@@ -115,7 +116,7 @@ struct atomic_operation_t
 struct aout_filter_sys_t
 {
     size_t i_overflow_buffer_size;/* in bytes */
-    byte_t * p_overflow_buffer;
+    uint8_t * p_overflow_buffer;
     unsigned int i_nb_atomic_operations;
     struct atomic_operation_t * p_atomic_operations;
 };
@@ -123,7 +124,7 @@ struct aout_filter_sys_t
 struct filter_sys_t
 {
     size_t i_overflow_buffer_size;/* in bytes */
-    byte_t * p_overflow_buffer;
+    uint8_t * p_overflow_buffer;
     unsigned int i_nb_atomic_operations;
     struct atomic_operation_t * p_atomic_operations;
 };
@@ -360,7 +361,7 @@ static int Init( vlc_object_t *p_this, struct aout_filter_sys_t * p_data
 static int Create( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
-    vlc_bool_t b_fit = VLC_TRUE;
+    bool b_fit = true;
 
     /* Activate this filter only with stereo devices */
     if( p_filter->output.i_physical_channels
@@ -374,27 +375,27 @@ static int Create( vlc_object_t *p_this )
     if( p_filter->input.i_original_channels
             != p_filter->output.i_original_channels )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->input.i_original_channels =
                                         p_filter->output.i_original_channels;
     }
     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');
     }
     if( p_filter->input.i_rate != p_filter->output.i_rate )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->input.i_rate = p_filter->output.i_rate;
     }
     if( p_filter->input.i_physical_channels == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT)
           && ( p_filter->input.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
           && ! config_GetInt ( p_filter , "headphone-dolby" ) )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->input.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
                                               AOUT_CHAN_CENTER |
                                               AOUT_CHAN_REARLEFT |
@@ -460,13 +461,14 @@ static void Destroy( 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);
     int i_input_nb = aout_FormatNbChannels( &p_filter->input );
     int i_output_nb = aout_FormatNbChannels( &p_filter->output );
 
     float * p_in = (float*) p_in_buf->p_buffer;
-    byte_t * p_out;
-    byte_t * p_overflow;
-    byte_t * p_slide;
+    uint8_t * p_out;
+    uint8_t * p_overflow;
+    uint8_t * p_slide;
 
     size_t i_overflow_size;     /* in bytes */
     size_t i_out_size;          /* in bytes */
@@ -574,7 +576,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 static int OpenFilter( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-    vlc_bool_t b_fit = VLC_TRUE;
+    bool b_fit = true;
 
     /* Activate this filter only with stereo devices */
     if( p_filter->fmt_out.audio.i_physical_channels
@@ -588,27 +590,27 @@ static int OpenFilter( vlc_object_t *p_this )
     if( p_filter->fmt_in.audio.i_original_channels
             != p_filter->fmt_out.audio.i_original_channels )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->fmt_in.audio.i_original_channels =
                                         p_filter->fmt_out.audio.i_original_channels;
     }
     if( p_filter->fmt_in.audio.i_format != VLC_FOURCC('f','l','3','2')
           || p_filter->fmt_out.audio.i_format != VLC_FOURCC('f','l','3','2') )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
         p_filter->fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
     }
     if( p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->fmt_in.audio.i_rate = p_filter->fmt_out.audio.i_rate;
     }
     if( p_filter->fmt_in.audio.i_physical_channels == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT)
           && ( p_filter->fmt_in.audio.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
           && !config_GetInt( p_filter, "headphone-dolby" ) )
     {
-        b_fit = VLC_FALSE;
+        b_fit = false;
         p_filter->fmt_in.audio.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
                                               AOUT_CHAN_CENTER |
                                               AOUT_CHAN_REARLEFT |