X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fequalizer.m;h=be97304702b89abfa91f2677dc362c89656ae52e;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=ed5fe88385f897fb2de1b3a196ad60bde23615b5;hpb=3305b049e7f587b23359a1c9047fb5763d19c1dc;p=vlc diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m index ed5fe88385..be97304702 100644 --- a/modules/gui/macosx/equalizer.m +++ b/modules/gui/macosx/equalizer.m @@ -10,7 +10,7 @@ * 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 @@ -35,7 +35,7 @@ #include "../../audio_filter/equalizer_presets.h" /***************************************************************************** - * VLCEqualizer implementation + * VLCEqualizer implementation *****************************************************************************/ @implementation VLCEqualizer @@ -152,7 +152,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, } [o_window setTitle: _NS("Equalizer")]; - /* + /* [o_slider_band1 setFloatValue: 0]; [o_slider_band2 setFloatValue: 0]; [o_slider_band3 setFloatValue: 0]; @@ -163,8 +163,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, [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]; } @@ -221,9 +221,9 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, 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]]; @@ -234,8 +234,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, [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]; @@ -300,7 +300,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, 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]]; @@ -311,9 +311,9 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, [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 ); } @@ -413,9 +413,9 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, [o_popup_presets selectItemAtIndex: i]; [o_slider_preamp setFloatValue: eqz_preset_10b[i]->f_preamp]; - [self setBandSlidersValues: (float *)eqz_preset_10b[i]->f_amp]; - - /* + [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]]; @@ -426,8 +426,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, [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]; @@ -467,48 +467,48 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, - (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