a52dec: pass sample formats by address rather than value

[vlc] / modules / audio_filter / equalizer.c

diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index de34d7df0d6edc1a44cb772e694ad93af4a2c46c..f35380a6da1bae07691df29da9190869c81716b7 100644 (file)
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -83,7 +83,7 @@ vlc_module_begin ()
         change_string_list( preset_list, preset_list_text, 0 )
     add_string( "equalizer-bands", NULL, BANDS_TEXT,
                 BANDS_LONGTEXT, true )
-    add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
+    add_bool( "equalizer-2pass", false, TWOPASS_TEXT,
               TWOPASS_LONGTEXT, true )
     add_float( "equalizer-preamp", 12.0, PREAMP_TEXT,
                PREAMP_LONGTEXT, true )
@@ -505,20 +505,20 @@ static int PresetCallback( vlc_object_t *p_aout, char const *psz_cmd,
         return VLC_SUCCESS;
     }
 
-    for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
+    for( unsigned i = 0; i < NB_PRESETS; i++ )
     {
-        if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
+        if( !strcasecmp( eqz_preset_10b[i].psz_name, psz_preset ) )
         {
             char *psz_newbands = NULL;
 
-            p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
+            p_sys->f_gamp *= pow( 10, eqz_preset_10b[i].f_preamp / 20.0 );
             for( int j = 0; j < p_sys->i_band; j++ )
             {
                 lldiv_t d;
                 char *psz;
 
-                p_sys->f_amp[j] = EqzConvertdB( eqz_preset_10b[i]->f_amp[j] );
-                d = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000, 10000000 );
+                p_sys->f_amp[j] = EqzConvertdB( eqz_preset_10b[i].f_amp[j] );
+                d = lldiv( eqz_preset_10b[i].f_amp[j] * 10000000, 10000000 );
                 if( asprintf( &psz, "%s %lld.%07llu",
                               psz_newbands ? psz_newbands : "",
                               d.quot, d.rem ) == -1 )
@@ -530,18 +530,18 @@ static int PresetCallback( vlc_object_t *p_aout, char const *psz_cmd,
                 free( psz_newbands );
                 psz_newbands = psz;
             }
-            if( p_sys->b_first == false )
+            if( !p_sys->b_first )
             {
                 vlc_mutex_unlock( &p_sys->lock );
                 var_SetString( p_aout, "equalizer-bands", psz_newbands );
                 var_SetFloat( p_aout, "equalizer-preamp",
-                              eqz_preset_10b[i]->f_preamp );
+                              eqz_preset_10b[i].f_preamp );
                 free( psz_newbands );
             }
             else
             {
                 p_sys->psz_newbands = psz_newbands;
-                p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
+                p_sys->f_newpreamp = eqz_preset_10b[i].f_preamp;
                 vlc_mutex_unlock( &p_sys->lock );
             }
             return VLC_SUCCESS;
@@ -550,8 +550,8 @@ static int PresetCallback( vlc_object_t *p_aout, char const *psz_cmd,
     vlc_mutex_unlock( &p_sys->lock );
     msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
     msg_Info( p_aout, "full list:" );
-    for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
-         msg_Info( p_aout, "  - '%s'", eqz_preset_10b[i]->psz_name );
+    for( unsigned i = 0; i < NB_PRESETS; i++ )
+         msg_Info( p_aout, "  - '%s'", eqz_preset_10b[i].psz_name );
     return VLC_SUCCESS;
 }