/*****************************************************************************
* equalizer.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2006 the VideoLAN team
* $Id$
*
* Authors: Jerome Decoodt <djc@videolan.org>
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <aout_internal.h>
+#include <vlc_aout.h>
#include "intf.h"
#include "../../audio_filter/equalizer_presets.h"
/*****************************************************************************
- * VLCEqualizer implementation
+ * VLCEqualizer implementation
*****************************************************************************/
@implementation VLCEqualizer
int i;
[o_btn_equalizer setToolTip: _NS("Equalizer")];
[o_ckb_2pass setTitle: _NS("2 Pass")];
- [o_ckb_2pass setToolTip: _NS("If you enable this settting, the "
- "equalizer filter will be applied twice. The effect will be sharper.")];
+ [o_ckb_2pass setToolTip: _NS("Apply the "
+ "equalizer filter twice. The effect will be sharper.")];
[o_ckb_enable setTitle: _NS("Enable")];
- [o_ckb_enable setToolTip: _NS("Enable the equalizer. You can either "
- "manually change the bands or use a preset.")];
+ [o_ckb_enable setToolTip: _NS("Enable the equalizer. Bands can be set "
+ "manually or using a preset.")];
[o_fld_preamp setStringValue: _NS("Preamp")];
[o_popup_presets removeAllItems];
}
[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];
[o_ckb_enable setState: NSOffState];
[o_ckb_2pass setState: NSOffState];
}
char *psz_bands, *psz_bands_init, *p_next;
vlc_bool_t b_2p;
int i;
- vlc_bool_t b_enabled = GetFiltersStatus( p_intf, "equalizer" );
+ vlc_bool_t b_enabled = GetFiltersStatus( p_intf, (char *)"equalizer" );
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
psz_bands = p_next+1;
}
free( psz_bands_init );
+ [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];
+
vlc_object_release( p_object );
}
- (IBAction)enable:(id)sender
{
- ChangeFiltersString( VLCIntf, "equalizer", [sender state] );
+ ChangeFiltersString( VLCIntf, (char *)"equalizer", [sender state] );
}
- (IBAction)preampSliderUpdated:(id)sender
[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_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];
}
+
+- (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;
+ }
+}
+
+- (void)setBandSlidersValues:(float *)values
+{
+ 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];
+ }
+}
+
+- (void)setValue:(float)value forSlider:(int)index
+{
+ id slider = [self getSliderByIndex:index];
+
+ if (slider != nil)
+ {
+ [slider setFloatValue:value];
+ }
+}
+
@end
projects / vlc / blobdiff