#include "qt4.hpp"
#include "input_manager.hpp"
-#include "../../audio_filter/equalizer_presets.h"
#include <vlc_aout.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h>
else if( lineedit )
{
char str[30];
- sprintf( str, "%06X", val.i_int );
+ snprintf( str, sizeof(str), "%06X", val.i_int );
lineedit->setText( str );
}
else if( combobox ) combobox->setCurrentIndex(
presetsComboBox = ui.presetsCombo;
ui.preampLabel->setFont( smallFont );
- ui.preampSlider->setMaximum( 400 );
+
for( int i = 0 ; i < NB_PRESETS ; i ++ )
{
ui.presetsCombo->addItem( qtr( preset_list_text[i] ),
bands[i] = new QSlider( Qt::Vertical );
bands[i]->setMaximum( 400 );
bands[i]->setValue( 200 );
- CONNECT( bands[i], valueChanged( int ), this, setBand() );
+ CONNECT( bands[i], valueChanged( int ), this, changeCoreBands() );
band_texts[i] = new QLabel( band_frequencies[i] + "\n0.0dB" );
band_texts[i]->setFont( smallFont );
grid->addWidget( bands[i], 0, i );
free( psz_af );
enable( ui.enableCheck->isChecked() );
- setValues( psz_bands, f_preamp );
+ updateUIValues( psz_bands, f_preamp );
}
Equalizer::~Equalizer()
void Equalizer::enable( bool en )
{
ui.eq2PassCheck->setEnabled( en );
+ ui.presetsCombo->setEnabled( en );
+ ui.presetLabel->setEnabled( en );
ui.preampLabel->setEnabled( en );
ui.preampSlider->setEnabled( en );
for( int i = 0 ; i< BANDS; i++ )
void Equalizer::setPreamp()
{
- float f= ( float )( ui.preampSlider->value() ) /10 - 20;
- char psz_val[5];
+ const float f = ( float )( ui.preampSlider->value() ) /10 - 20;
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
- sprintf( psz_val, "%.1f", f );
- ui.preampLabel->setText( qtr( "Preamp\n" ) + psz_val + qtr( "dB" ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f, 'f', 1 )
+ + qtr( "dB" ) );
if( p_aout )
{
delCallbacks( p_aout );
config_PutFloat( p_intf, "equalizer-preamp", f );
}
-void Equalizer::setBand()
+void Equalizer::changeCoreBands()
{
- char psz_values[102]; memset( psz_values, 0, 102 );
-
/**\todo smoothing */
- for( int i = 0 ; i< BANDS ; i++ )
+ QString values;
+ for( int i = 0; i < BANDS; i++ )
{
- char psz_val[8];
- float f_val = ( float )( bands[i]->value() ) / 10 - 20 ;
- sprintf( psz_values, "%s %f", psz_values, f_val );
- sprintf( psz_val, "% 5.1f", f_val );
- band_texts[i]->setText( band_frequencies[i] + "\n" + psz_val + "dB" );
+ const float f_val = (float)( bands[i]->value() ) / 10 - 20;
+ QString val = QString("%1").arg( f_val, 5, 'f', 1 );
+
+ band_texts[i]->setText( band_frequencies[i] + "\n" + val + "dB" );
+ values += " " + val;
}
+ const char *psz_values = values.toAscii().constData();
+
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_aout )
vlc_object_release( p_aout );
}
}
-void Equalizer::setValues( char *psz_bands, float f_preamp )
+
+void Equalizer::updateUIValues( char *psz_bands, float f_preamp )
{
char *p = psz_bands;
if ( p )
{
for( int i = 0; i < BANDS; i++ )
{
- char psz_val[8];
- float f = strtof( p, &p );
- int i_val= ( int )( ( f + 20 ) * 10 );
- bands[i]->setValue( i_val );
- sprintf( psz_val, "% 5.1f", f );
- band_texts[i]->setText( band_frequencies[i] + "\n" + psz_val +
- "dB" );
- if( p == NULL || *p == '\0' ) break;
+ const float f = us_strtod(p, &p );
+
+ bands[i]->setValue( (int)( ( f + 20 ) * 10 ) );
+
+ band_texts[i]->setText( band_frequencies[i] + "\n" + QString("%1").arg( f, 5, 'f', 1 ) + "dB" );
+ if( p == NULL || *p == '\0' )
+ break;
p++;
- if( *p == '\0' ) break;
+ if( *p == '\0' )
+ break;
}
}
- char psz_val[5];
- int i_val = ( int )( ( f_preamp + 20 ) * 10 );
- sprintf( psz_val, "%.1f", f_preamp );
- ui.preampSlider->setValue( i_val );
- ui.preampLabel->setText( qtr( "Preamp\n" ) + psz_val + qtr( "dB" ) );
+ ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" )
+ + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
}
-void Equalizer::setPreset( int preset )
+char * Equalizer::createValuesFromPreset( int i_preset )
{
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ QString values;
+ char *psz_values;
- char psz_values[102]; memset( psz_values, 0, 102 );
- char psz_values2[102];memset( psz_values2, 0, 102 );
+ /* Create the QString in Qt */
for( int i = 0 ; i< BANDS ;i++ )
- {
- strcpy( psz_values2, psz_values );
+ values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] );
- sprintf( psz_values, "%s %5.1f",
- psz_values2, eqz_preset_10b[preset]->f_amp[i] );
- }
+ /* Convert it to char * */
+ if( !asprintf( &psz_values, "%s", values.toAscii().constData() ) )
+ return NULL;
+
+ /* Update the UI */
+ updateUIValues( psz_values, eqz_preset_10b[i_preset]->f_preamp );
+ return psz_values;
+}
+void Equalizer::setPreset( int i_preset )
+{
+ char *psz_values = createValuesFromPreset( i_preset );
+ if( !psz_values ) return ;
+
+ aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_aout )
{
delCallbacks( p_aout );
var_SetString( p_aout, "equalizer-bands", psz_values );
var_SetFloat( p_aout, "equalizer-preamp",
- eqz_preset_10b[preset]->f_preamp );
+ eqz_preset_10b[i_preset]->f_preamp );
addCallbacks( p_aout );
vlc_object_release( p_aout );
}
config_PutPsz( p_intf, "equalizer-bands", psz_values );
config_PutFloat( p_intf, "equalizer-preamp",
- eqz_preset_10b[preset]->f_preamp );
-
- setValues( psz_values, eqz_preset_10b[preset]->f_preamp );
+ eqz_preset_10b[i_preset]->f_preamp );
}
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
void Spatializer::setValues( float *controlVars )
{
- char psz_val[5];
- char var_name[5];
aout_instance_t *p_aout= ( aout_instance_t * )
vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
{
- float f= ( float )( spatCtrl[i]->value() );
- sprintf( psz_val, "%.1f", f );
- ctrl_readout[i]->setText( psz_val );
+ float f = (float)( spatCtrl[i]->value() );
+ ctrl_readout[i]->setText( QString::number( f, 'f', 1 ) );
}
if( p_aout )
{
updateButton = new QToolButton;
updateButton->setAutoRaise( true );
updateButton->setText( "u" );
- updateButton->setToolTip( qtr( "Force update of the values in this dialog" ) );
+ updateButton->setToolTip( qtr( "Force update of this dialog's values" ) );
mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
projects / vlc / blobdiff