* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include "../../audio_filter/equalizer_presets.h"
/*****************************************************************************
- * VLCEqualizer implementation
+ * VLCEqualizer implementation
*****************************************************************************/
@implementation VLCEqualizer
if( p_object == NULL )
return;
- psz_string = var_GetString( p_object, "audio-filter" );
+ psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
if( !psz_string ) psz_string = strdup( "" );
if( p_object == NULL )
return VLC_FALSE;
- psz_string = var_GetString( p_object, "audio-filter" );
+ psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
vlc_object_release( p_object );
}
[o_window setTitle: _NS("Equalizer")];
- /*
+ /*
[o_slider_band1 setFloatValue: 0];
[o_slider_band2 setFloatValue: 0];
[o_slider_band3 setFloatValue: 0];
[o_slider_band8 setFloatValue: 0];
[o_slider_band9 setFloatValue: 0];
[o_slider_band10 setFloatValue: 0];
- */
- [self initBandSliders];
+ */
+ [self initBandSliders];
[o_ckb_enable setState: NSOffState];
[o_ckb_2pass setState: NSOffState];
}
VLC_VAR_DOINHERIT );
f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
- psz_bands = var_GetString( p_object, "equalizer-bands" );
+ psz_bands = var_GetNonEmptyString( p_object, "equalizer-bands" );
- if( !strcmp( psz_bands, "" ) )
+ if( psz_bands == NULL )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
b_2p = var_GetBool( p_object, "equalizer-2pass" );
psz_bands = p_next+1;
}
free( psz_bands_init );
- [self setBandSlidersValues:f_band];
+ [self setBandSlidersValues:f_band];
- /*
+ /*
[o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: f_band[2]];
[o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: f_band[9]];
- */
-
+ */
+
/* Set the the checkboxes */
if( b_enabled == VLC_TRUE )
[o_ckb_enable setState:NSOnState];
var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp);
[o_slider_preamp setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp];
- /*
+ /*
[o_slider_band1 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[0]];
[o_slider_band2 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[1]];
[o_slider_band3 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[2]];
[o_slider_band8 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[7]];
[o_slider_band9 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[8]];
[o_slider_band10 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[9]];
- */
- [self setBandSlidersValues:(float *)eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp];
-
+ */
+ [self setBandSlidersValues:(float *)eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp];
+
vlc_object_release( p_object );
}
var_Create( p_object, "equalizer-preset", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
- psz_preset = var_GetString( p_object, "equalizer-preset" );
+ psz_preset = var_GetNonEmptyString( p_object, "equalizer-preset" );
- for( i = 0 ; i < 18 ; i++ )
+ for( i = 0 ; (psz_preset != NULL) && (i < 18) ; i++ )
{
- if( !strcmp( preset_list[i], psz_preset ) )
+ if( strcmp( preset_list[i], psz_preset ) )
+ continue;
+
+ [o_popup_presets selectItemAtIndex: i];
+
+ [o_slider_preamp setFloatValue: eqz_preset_10b[i]->f_preamp];
+ [self setBandSlidersValues: (float *)eqz_preset_10b[i]->f_amp];
+
+ /*
+ [o_slider_band1 setFloatValue: eqz_preset_10b[i]->f_amp[0]];
+ [o_slider_band2 setFloatValue: eqz_preset_10b[i]->f_amp[1]];
+ [o_slider_band3 setFloatValue: eqz_preset_10b[i]->f_amp[2]];
+ [o_slider_band4 setFloatValue: eqz_preset_10b[i]->f_amp[3]];
+ [o_slider_band5 setFloatValue: eqz_preset_10b[i]->f_amp[4]];
+ [o_slider_band6 setFloatValue: eqz_preset_10b[i]->f_amp[5]];
+ [o_slider_band7 setFloatValue: eqz_preset_10b[i]->f_amp[6]];
+ [o_slider_band8 setFloatValue: eqz_preset_10b[i]->f_amp[7]];
+ [o_slider_band9 setFloatValue: eqz_preset_10b[i]->f_amp[8]];
+ [o_slider_band10 setFloatValue: eqz_preset_10b[i]->f_amp[9]];
+ */
+
+ if( strcmp( psz_preset, "flat" ) )
{
- [o_popup_presets selectItemAtIndex: i];
-
- [o_slider_preamp setFloatValue: eqz_preset_10b[i]->f_preamp];
- [self setBandSlidersValues: (float *)eqz_preset_10b[i]->f_amp];
-
- /*
- [o_slider_band1 setFloatValue: eqz_preset_10b[i]->f_amp[0]];
- [o_slider_band2 setFloatValue: eqz_preset_10b[i]->f_amp[1]];
- [o_slider_band3 setFloatValue: eqz_preset_10b[i]->f_amp[2]];
- [o_slider_band4 setFloatValue: eqz_preset_10b[i]->f_amp[3]];
- [o_slider_band5 setFloatValue: eqz_preset_10b[i]->f_amp[4]];
- [o_slider_band6 setFloatValue: eqz_preset_10b[i]->f_amp[5]];
- [o_slider_band7 setFloatValue: eqz_preset_10b[i]->f_amp[6]];
- [o_slider_band8 setFloatValue: eqz_preset_10b[i]->f_amp[7]];
- [o_slider_band9 setFloatValue: eqz_preset_10b[i]->f_amp[8]];
- [o_slider_band10 setFloatValue: eqz_preset_10b[i]->f_amp[9]];
- */
-
- if( strcmp( psz_preset, "flat" ) )
- {
- char psz_bands[100];
- memset( psz_bands, 0, 100 );
-
- sprintf( psz_bands, "%.1f %.1f %.1f %.1f %.1f %.1f %.1f "
- "%.1f %.1f %.1f",
- eqz_preset_10b[i]->f_amp[0],
- eqz_preset_10b[i]->f_amp[1],
- eqz_preset_10b[i]->f_amp[2],
- eqz_preset_10b[i]->f_amp[3],
- eqz_preset_10b[i]->f_amp[4],
- eqz_preset_10b[i]->f_amp[5],
- eqz_preset_10b[i]->f_amp[6],
- eqz_preset_10b[i]->f_amp[7],
- eqz_preset_10b[i]->f_amp[8],
- eqz_preset_10b[i]->f_amp[9] );
-
- var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
- VLC_VAR_DOINHERIT );
- var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
- VLC_VAR_DOINHERIT );
- var_SetFloat( p_object, "equalizer-preamp",
- eqz_preset_10b[i]->f_preamp );
- var_SetString( p_object, "equalizer-bands", psz_bands );
- }
+ char psz_bands[100];
+
+ snprintf( psz_bands, sizeof( psz_bands ),
+ "%.1f %.1f %.1f %.1f %.1f %.1f %.1f "
+ "%.1f %.1f %.1f",
+ eqz_preset_10b[i]->f_amp[0],
+ eqz_preset_10b[i]->f_amp[1],
+ eqz_preset_10b[i]->f_amp[2],
+ eqz_preset_10b[i]->f_amp[3],
+ eqz_preset_10b[i]->f_amp[4],
+ eqz_preset_10b[i]->f_amp[5],
+ eqz_preset_10b[i]->f_amp[6],
+ eqz_preset_10b[i]->f_amp[7],
+ eqz_preset_10b[i]->f_amp[8],
+ eqz_preset_10b[i]->f_amp[9] );
+
+ var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
+ VLC_VAR_DOINHERIT );
+ var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
+ VLC_VAR_DOINHERIT );
+ var_SetFloat( p_object, "equalizer-preamp",
+ eqz_preset_10b[i]->f_preamp );
+ var_SetString( p_object, "equalizer-bands", psz_bands );
}
}
free( psz_preset );
- (id)getSliderByIndex:(int)index
{
- switch(index)
- {
- case 0 : return o_slider_band1;
- case 1 : return o_slider_band2;
- case 2 : return o_slider_band3;
- case 3 : return o_slider_band4;
- case 4 : return o_slider_band5;
- case 5 : return o_slider_band6;
- case 6 : return o_slider_band7;
- case 7 : return o_slider_band8;
- case 8 : return o_slider_band9;
- case 9 : return o_slider_band10;
- default : return nil;
- }
+ switch(index)
+ {
+ case 0 : return o_slider_band1;
+ case 1 : return o_slider_band2;
+ case 2 : return o_slider_band3;
+ case 3 : return o_slider_band4;
+ case 4 : return o_slider_band5;
+ case 5 : return o_slider_band6;
+ case 6 : return o_slider_band7;
+ case 7 : return o_slider_band8;
+ case 8 : return o_slider_band9;
+ case 9 : return o_slider_band10;
+ default : return nil;
+ }
}
- (void)setBandSlidersValues:(float *)values
{
- int i = 0;
- for (i = 0 ; i<= 9 ; i++)
- {
- [self setValue:values[i] forSlider:i];
- }
+ int i = 0;
+ for (i = 0 ; i<= 9 ; i++)
+ {
+ [self setValue:values[i] forSlider:i];
+ }
}
- (void)initBandSliders
{
- int i = 0;
- for (i = 0 ; i< 9 ; i++)
- {
- [self setValue:0.0 forSlider:i];
- }
+ int i = 0;
+ for (i = 0 ; i< 9 ; i++)
+ {
+ [self setValue:0.0 forSlider:i];
+ }
}
- (void)setValue:(float)value forSlider:(int)index
{
- id slider = [self getSliderByIndex:index];
-
- if (slider != nil)
- {
- [slider setFloatValue:value];
- }
+ id slider = [self getSliderByIndex:index];
+
+ if (slider != nil)
+ {
+ [slider setFloatValue:value];
+ }
}
@end