/*****************************************************************************
* equalizer.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: equalizer.m 1 2004-08-07 23:50:00Z djc $
+ * Copyright (C) 2004-2006 the VideoLAN team
+ * $Id$
*
- * Authors: J\8er\99me Decoodt <djc@videolan.org>
+ * Authors: Jerome Decoodt <djc@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* 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 <math.h>
#include "equalizer.h"
+#include "../../audio_filter/equalizer_presets.h"
/*****************************************************************************
- * VLCEqualizer implementation
+ * VLCEqualizer implementation
*****************************************************************************/
@implementation VLCEqualizer
static void ChangeFiltersString( intf_thread_t *p_intf,
- aout_instance_t * p_aout,
char *psz_name, vlc_bool_t b_add )
{
char *psz_parser, *psz_string;
+ int i;
+ vlc_object_t *p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = (aout_instance_t *)p_object;
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
- if( p_aout )
- {
- psz_string = var_GetString( p_aout, "audio-filter" );
- }
- else
- {
- psz_string = config_GetPsz( p_intf, "audio-filter" );
- }
+ psz_string = var_GetString( p_object, "audio-filter" );
- if( !psz_string ) psz_string = strdup("");
+ if( !psz_string ) psz_string = strdup( "" );
psz_parser = strstr( psz_string, psz_name );
if( !psz_parser )
{
psz_parser = psz_string;
- asprintf( &psz_string, (*psz_string) ? "%s,%s" : "%s%s",
+ asprintf( &psz_string, ( *psz_string ) ? "%s,%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
{
if( psz_parser )
{
- memmove( psz_parser, psz_parser + strlen(psz_name) +
- (*(psz_parser + strlen(psz_name)) == ',' ? 1 : 0 ),
- strlen(psz_parser + strlen(psz_name)) + 1 );
+ memmove( psz_parser, psz_parser + strlen( psz_name ) +
+ ( *( psz_parser + strlen( psz_name ) ) == ',' ? 1 : 0 ),
+ strlen( psz_parser + strlen( psz_name ) ) + 1 );
- if( *(psz_string+strlen(psz_string ) -1 ) == ',' )
+ if( *( psz_string+strlen( psz_string ) - 1 ) == ',' )
{
- *(psz_string+strlen(psz_string ) -1 ) = '\0';
+ *( psz_string+strlen( psz_string ) - 1 ) = '\0';
}
}
else
}
}
- if( p_aout == NULL )
- {
- config_PutPsz( p_intf, "audio-filter", psz_string );
- }
- else
+ var_SetString( p_object, "audio-filter", psz_string );
+ if( p_aout )
{
- int i;
- var_SetString( p_aout, "audio-filter", psz_string );
for( i = 0; i < p_aout->i_nb_inputs; i++ )
{
p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
}
}
free( psz_string );
+ vlc_object_release( p_object );
}
static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
- aout_instance_t * p_aout,
char *psz_name )
{
char *psz_parser, *psz_string;
+ vlc_object_t *p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return VLC_FALSE;
- if( p_aout )
- {
- psz_string = var_GetString( p_aout, "audio-filter" );
- }
- else
- {
- psz_string = config_GetPsz( p_intf, "audio-filter" );
- }
+ psz_string = var_GetString( p_object, "audio-filter" );
- if( !psz_string ) psz_string = strdup("");
+ vlc_object_release( p_object );
+
+ if( !psz_string ) return VLC_FALSE;
psz_parser = strstr( psz_string, psz_name );
free( psz_string );
- if (psz_parser)
+ if ( psz_parser )
return VLC_TRUE;
else
return VLC_FALSE;
}
+- (void)initStrings
+{
+ int i;
+ [o_btn_equalizer setToolTip: _NS("Equalizer")];
+ [o_ckb_2pass setTitle: _NS("2 Pass")];
+ [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. Bands can be set "
+ "manually or using a preset.")];
+ [o_fld_preamp setStringValue: _NS("Preamp")];
+
+ [o_popup_presets removeAllItems];
+ for( i = 0; i < 18 ; i++ )
+ {
+ [o_popup_presets insertItemWithTitle: _NS(preset_list_text[i]) atIndex: i];
+ }
+ [o_window setTitle: _NS("Equalizer")];
+
+ /*
+ [o_slider_band1 setFloatValue: 0];
+ [o_slider_band2 setFloatValue: 0];
+ [o_slider_band3 setFloatValue: 0];
+ [o_slider_band4 setFloatValue: 0];
+ [o_slider_band5 setFloatValue: 0];
+ [o_slider_band6 setFloatValue: 0];
+ [o_slider_band7 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];
+}
+
+- (void)equalizerUpdated
+{
+ intf_thread_t *p_intf = VLCIntf;
+ float f_preamp, f_band[10];
+ char *psz_bands, *psz_bands_init, *p_next;
+ vlc_bool_t b_2p;
+ int i;
+ 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 );
+
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
+
+ var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
+ VLC_VAR_DOINHERIT );
+ var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
+ VLC_VAR_DOINHERIT );
+
+ f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
+ psz_bands = var_GetString( p_object, "equalizer-bands" );
+
+ if( !strcmp( psz_bands, "" ) )
+ psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
+
+ b_2p = var_GetBool( p_object, "equalizer-2pass" );
+
+ vlc_object_release( p_object );
+
+/* Set the preamp slider */
+ [o_slider_preamp setFloatValue: f_preamp];
+
+/* Set the bands slider */
+ psz_bands_init = psz_bands;
+
+ for( i = 0; i < 10; i++ )
+ {
+ /* Read dB -20/20 */
+#ifdef HAVE_STRTOF
+ f_band[i] = strtof( psz_bands, &p_next );
+#else
+ f_band[i] = (float)strtod( psz_bands, &p_next );
+#endif
+ if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
+
+ if( !*psz_bands ) break; /* end of line */
+ 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_band4 setFloatValue: f_band[3]];
+ [o_slider_band5 setFloatValue: f_band[4]];
+ [o_slider_band6 setFloatValue: f_band[5]];
+ [o_slider_band7 setFloatValue: f_band[6]];
+ [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];
+ else
+ [o_ckb_enable setState:NSOffState];
+
+ [o_ckb_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
+}
+
- (IBAction)bandSliderUpdated:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
+ intf_thread_t *p_intf = VLCIntf;
+ vlc_object_t *p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
char psz_values[102];
memset( psz_values, 0, 102 );
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
+
/* Write the new bands values */
/* TODO: write a generic code instead of ten times the same thing */
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band9 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] );
- if( p_aout == NULL )
- {
- config_PutPsz( p_intf, "equalizer-bands", psz_values );
- msg_Dbg( p_intf, "equalizer settings set to %s", psz_values);
- }
- else
- {
- var_SetString( p_aout, "equalizer-bands", psz_values );
- msg_Dbg( p_intf, "equalizer settings changed to %s", psz_values);
- vlc_object_release( p_aout );
- }
+ var_SetString( p_object, "equalizer-bands", psz_values );
+ vlc_object_release( p_object );
}
- (IBAction)changePreset:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- float preamp, band[10];
- char *p, *p_next;
- int b_2p;
+ intf_thread_t *p_intf = VLCIntf;
int i;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
-
- vlc_bool_t enabled = GetFiltersStatus( p_intf, p_aout, "equalizer" );
-
-static char *preset_list[] = {
- "flat", "classical", "club", "dance", "fullbass", "fullbasstreeble",
- "fulltreeble", "headphones","largehall", "live", "party", "pop", "reggae",
- "rock", "ska", "soft", "softrock", "techno"
-};
-
- if( p_aout == NULL )
- {
- config_PutPsz( p_intf, "equalizer-preset",preset_list[[sender indexOfSelectedItem]] );
- }
- else
- {
- var_SetString( p_aout , "equalizer-preset" ,preset_list[[sender indexOfSelectedItem]] );
- vlc_object_release( p_aout );
- }
+ vlc_object_t *p_object= vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ char psz_values[102];
+ memset( psz_values, 0, 102 );
-
- if( ( p_aout == NULL ) || ( enabled == VLC_FALSE ) )
- {
- preamp = config_GetFloat( p_intf, "equalizer-preamp" );
- p = config_GetPsz( p_intf, "equalizer-bands");
- b_2p = config_GetInt( p_intf, "equalizer-2pass" );
- }
- else
- {
- preamp = var_GetFloat( p_aout, "equalizer-preamp" );
- p = var_GetString( p_aout, "equalizer-bands" );
- b_2p = var_GetBool( p_aout, "equalizer-2pass" );
- vlc_object_release( p_aout );
- }
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
-/* Set the preamp slider */
- [o_slider_preamp setFloatValue: preamp];
+ var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
-/* Set the bands slider */
for( i = 0; i < 10; i++ )
- {
- /* Read dB -20/20 */
-#ifdef HAVE_STRTOF
- band[i] = strtof( p, &p_next );
-#else
- band[i] = (float) strtod( p, &p_next );
-#endif
- if( !p_next || p_next == p ) break; /* strtof() failed */
-
- if( !*p ) break; /* end of line */
- p=p_next+1;
- }
- [o_slider_band1 setFloatValue: band[0]];
- [o_slider_band2 setFloatValue: band[1]];
- [o_slider_band3 setFloatValue: band[2]];
- [o_slider_band4 setFloatValue: band[3]];
- [o_slider_band5 setFloatValue: band[4]];
- [o_slider_band6 setFloatValue: band[5]];
- [o_slider_band7 setFloatValue: band[6]];
- [o_slider_band8 setFloatValue: band[7]];
- [o_slider_band9 setFloatValue: band[8]];
- [o_slider_band10 setFloatValue: band[9]];
-
- if( enabled == VLC_TRUE )
- [o_btn_enable setState:NSOnState];
- else
- [o_btn_enable setState:NSOffState];
-
- [o_btn_2pass setState:( ( b_2p == VLC_TRUE )?NSOnState:NSOffState )];
+ sprintf( psz_values, "%s %.1f", psz_values, eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[i] );
+ var_SetString( p_object, "equalizer-bands", psz_values );
+ 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_band4 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[3]];
+ [o_slider_band5 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[4]];
+ [o_slider_band6 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[5]];
+ [o_slider_band7 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[6]];
+ [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
{
- intf_thread_t * p_intf = VLCIntf;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
- ChangeFiltersString( p_intf,p_aout, "equalizer", [sender state]);
-
- if( p_aout != NULL )
- vlc_object_release( p_aout );
+ ChangeFiltersString( VLCIntf, (char *)"equalizer", [sender state] );
}
- (IBAction)preampSliderUpdated:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- float f= [sender floatValue] ;
+ intf_thread_t *p_intf = VLCIntf;
+ float f_preamp = [sender floatValue] ;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
+ vlc_object_t *p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
- if( p_aout == NULL )
- {
- config_PutFloat( p_intf, "equalizer-preamp", f );
- }
- else
- {
- var_SetFloat( p_aout, "equalizer-preamp", f );
- vlc_object_release( p_aout );
- }
+ var_SetFloat( p_object, "equalizer-preamp", f_preamp );
+
+ vlc_object_release( p_object );
}
- (IBAction)toggleWindow:(id)sender
}
else
{
- intf_thread_t * p_intf = VLCIntf;
- float preamp, band[10];
- char *p, *p_next;
- int b_2p;
- int i;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
-
- vlc_bool_t enabled = GetFiltersStatus( p_intf, p_aout, "equalizer" );
-
- if( ( p_aout == NULL ) || ( enabled == VLC_FALSE ) )
- {
- preamp = config_GetFloat( p_intf, "equalizer-preamp" );
- p = config_GetPsz( p_intf, "equalizer-bands");
- b_2p = config_GetInt( p_intf, "equalizer-2pass" );
- }
- else
- {
- preamp = var_GetFloat( p_aout, "equalizer-preamp" );
- p = var_GetString( p_aout, "equalizer-bands" );
- b_2p = var_GetBool( p_aout, "equalizer-2pass" );
- vlc_object_release( p_aout );
- }
- if( !p )
- p = "0 0 0 0 0 0 0 0 0 0";
-
-/* Set the preamp slider */
- [o_slider_preamp setFloatValue: preamp];
-
-/* Set the bands slider */
- for( i = 0; i < 10; i++ )
- {
- /* Read dB -20/20 */
-#ifdef HAVE_STRTOF
- band[i] = strtof( p, &p_next );
-#else
- band[i] = (float) strtod( p, &p_next );
-#endif
- if( !p_next || p_next == p ) break; /* strtof() failed */
-
- if( !*p ) break; /* end of line */
- p=p_next+1;
- }
- [o_slider_band1 setFloatValue: band[0]];
- [o_slider_band2 setFloatValue: band[1]];
- [o_slider_band3 setFloatValue: band[2]];
- [o_slider_band4 setFloatValue: band[3]];
- [o_slider_band5 setFloatValue: band[4]];
- [o_slider_band6 setFloatValue: band[5]];
- [o_slider_band7 setFloatValue: band[6]];
- [o_slider_band8 setFloatValue: band[7]];
- [o_slider_band9 setFloatValue: band[8]];
- [o_slider_band10 setFloatValue: band[9]];
-
- if( enabled == VLC_TRUE )
- [o_btn_enable setState:NSOnState];
- else
- [o_btn_enable setState:NSOffState];
-
- [o_btn_2pass setState:( ( b_2p == VLC_TRUE )?NSOnState:NSOffState )];
-
[o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState];
}
- (IBAction)twopass:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE);
-
+ intf_thread_t *p_intf = VLCIntf;
vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE;
-
- if( p_aout == NULL )
+ vlc_object_t *p_object= vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = (aout_instance_t *)p_object;
+ if( p_object == NULL )
+ p_object = vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_object == NULL )
+ return;
+
+ var_SetBool( p_object, "equalizer-2pass", b_2p );
+ if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
{
- config_PutInt( p_intf, "equalizer-2pass", b_2p );
+ int i;
+ for( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+ }
}
- else
+
+ vlc_object_release( p_object );
+}
+
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+ [o_btn_equalizer setState: NSOffState];
+}
+
+- (void)awakeFromNib
+{
+ int i;
+ vlc_object_t *p_object= vlc_object_find( VLCIntf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if( p_object == NULL )
+ p_object = vlc_object_find( VLCIntf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ [o_window setExcludedFromWindowsMenu: TRUE];
+
+ [self initStrings];
+
+ if( p_object )
{
- var_SetBool( p_aout, "equalizer-2pass", b_2p );
- if( [o_btn_enable state] )
+ char *psz_preset;
+
+ var_Create( p_object, "equalizer-preset", VLC_VAR_STRING |
+ VLC_VAR_DOINHERIT );
+ psz_preset = var_GetString( p_object, "equalizer-preset" );
+
+ for( i = 0 ; i < 18 ; i++ )
{
- int i;
- for( i = 0; i < p_aout->i_nb_inputs; i++ )
+ if( !strcmp( preset_list[i], psz_preset ) )
{
- p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+ [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 );
+ }
}
}
- vlc_object_release( p_aout );
+ free( psz_preset );
+ vlc_object_release( p_object );
}
+ [self equalizerUpdated];
+
+}
+
+
+- (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