Used VLC_CODEC_* and vlc_fourcc_GetCodec when suitable.

[vlc] / modules / audio_filter / equalizer.c

diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index ae70807a02cde676466a88146af31c9189f0cdef..e10696f82aceb0b9394cb76ef1835ac4372f9d19 100644 (file)
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -33,6 +33,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_charset.h>
 
 #include "vlc_aout.h"
 
@@ -77,14 +78,14 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AFILTER )
 
     add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
-                PRESET_LONGTEXT, false );
-        change_string_list( preset_list, preset_list_text, 0 );
+                PRESET_LONGTEXT, false )
+        change_string_list( preset_list, preset_list_text, 0 )
     add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
-                BANDS_LONGTEXT, true );
+                BANDS_LONGTEXT, true )
     add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT,
-              TWOPASS_LONGTEXT, true );
+              TWOPASS_LONGTEXT, true )
     add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
-               PREAMP_LONGTEXT, true );
+               PREAMP_LONGTEXT, true )
     set_callbacks( Open, Close )
     add_shortcut( "equalizer" )
 vlc_module_end ()
@@ -92,7 +93,7 @@ vlc_module_end ()
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-typedef struct aout_filter_sys_t
+struct aout_filter_sys_t
 {
     /* Filter static config */
     int i_band;
@@ -117,7 +118,7 @@ typedef struct aout_filter_sys_t
     float x2[32][2];
     float y2[32][128][2];
 
-} aout_filter_sys_t;
+};
 
 static void DoWork( aout_instance_t *, aout_filter_t *,
                     aout_buffer_t *, aout_buffer_t * );
@@ -146,12 +147,12 @@ static int Open( vlc_object_t *p_this )
     aout_filter_sys_t *p_sys;
     bool         b_fit = true;
 
-    if( 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_format != VLC_CODEC_FL32 ||
+        p_filter->output.i_format != VLC_CODEC_FL32 )
     {
         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');
+        p_filter->input.i_format = VLC_CODEC_FL32;
+        p_filter->output.i_format = VLC_CODEC_FL32;
         msg_Warn( p_filter, "bad input or output format" );
     }
     if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
@@ -505,52 +506,52 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
     aout_instance_t *p_aout = (aout_instance_t *)p_this;
 
     char *psz_preset = newval.psz_string;
-    char psz_newbands[120];
 
-    memset( psz_newbands, 0, 120 );
+    if( !*psz_preset || p_sys->i_band != 10 )
+        return VLC_SUCCESS;
 
-    if( *psz_preset && p_sys->i_band == 10 )
+    for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
     {
-        int i;
-        /* */
-        for( i = 0; eqz_preset_10b[i] != NULL; 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 );
+            for( int j = 0; j < p_sys->i_band; j++ )
             {
-                int j;
-                p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
-                for( j = 0; j < p_sys->i_band; j++ )
-                {
-                    lldiv_t div;
-                    p_sys->f_amp[j] = EqzConvertdB(
-                                        eqz_preset_10b[i]->f_amp[j] );
-                    div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000,
-                                 10000000 );
-                    sprintf( psz_newbands, "%s %"PRId64".%07u", psz_newbands,
-                                      (int64_t)div.quot, (unsigned int) div.rem );
-                }
-                if( p_sys->b_first == false )
-                {
-                    var_SetString( p_aout, "equalizer-bands", psz_newbands );
-                    var_SetFloat( p_aout, "equalizer-preamp",
-                                    eqz_preset_10b[i]->f_preamp );
-                }
-                else
+                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 );
+                if( asprintf( &psz, "%s %lld.%07llu",
+                              psz_newbands ? psz_newbands : "",
+                              d.quot, d.rem ) == -1 )
                 {
-                    p_sys->psz_newbands = strdup( psz_newbands );
-                    p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
+                    free( psz_newbands );
+                    return VLC_ENOMEM;
                 }
-                break;
+                psz_newbands = psz;
             }
-        }
-        if( eqz_preset_10b[i] == NULL )
-        {
-            msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
-            msg_Dbg( p_aout, "full list:" );
-            for( i = 0; eqz_preset_10b[i] != NULL; i++ )
-                msg_Dbg( p_aout, "  - '%s'", eqz_preset_10b[i]->psz_name );
+            if( p_sys->b_first == false )
+            {
+                var_SetString( p_aout, "equalizer-bands", psz_newbands );
+                var_SetFloat( p_aout, "equalizer-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;
+            }
+            return VLC_SUCCESS;
         }
     }
+    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 );
     return VLC_SUCCESS;
 }
 
@@ -588,11 +589,8 @@ static int BandsCallback( vlc_object_t *p_this, char const *psz_cmd,
             break;
 
         /* Read dB -20/20 */
-#ifdef HAVE_STRTOF
-        f = strtof( p, &psz_next );
-#else
-        f = (float)strtod( p, &psz_next );
-#endif
+        f = us_strtof( p, &psz_next );
+
         if( psz_next == p )
             break; /* no conversion */