X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=3a05513f1bc38974ef9f85b1c5ffb4e8a5da3eae;hb=edeb8f7bc73ca5bf1eeeca767469098252add6fa;hp=b7adeb76cea7852bb4abf7a1f6c91c686066021e;hpb=8e756cec1bd06ae701367708134fdbbb76bed755;p=vlc diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp old mode 100755 new mode 100644 index b7adeb76ce..3a05513f1b --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * extended_panels.cpp : Extended controls panels **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -21,6 +21,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#define __STDC_FORMAT_MACROS 1 + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -35,15 +38,16 @@ #include "components/extended_panels.hpp" #include "dialogs/preferences.hpp" -#include "dialogs_provider.hpp" #include "qt4.hpp" #include "input_manager.hpp" +#include "../../audio_filter/equalizer_presets.h" #include #include #include #include +#include /* us_strtod */ #if 0 class ConfClickHandler : public QObject @@ -91,9 +95,10 @@ QString OptionFromWidgetName( QObject *obj ) } ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : - p_intf( _p_intf ) + QObject( _parent ), p_intf( _p_intf ) { ui.setupUi( _parent ); + p_vout = NULL; #define SETUP_VFILTER( widget ) \ { \ @@ -130,10 +135,10 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) ) SETUP_VFILTER( extract ) - SETUP_VFILTER_OPTION( extractComponentText, textChanged( QString ) ) + SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) ) SETUP_VFILTER( colorthres ) - SETUP_VFILTER_OPTION( colorthresColorText, textChanged( QString ) ) + SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) ) SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) ) @@ -193,14 +198,31 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) ) SETUP_VFILTER( marq ) - SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( QString ) ) + SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) ) SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) ) SETUP_VFILTER( logo ) SETUP_VFILTER_OPTION( logoFileText, editingFinished() ) SETUP_VFILTER_OPTION( logoYSpin, valueChanged( int ) ) SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) ) - SETUP_VFILTER_OPTION( logoTransparencySlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) ) + + if( module_exists( "atmo" ) ) + { + SETUP_VFILTER( atmo ) + SETUP_VFILTER_OPTION( atmoEdgeweightningSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoBrightnessSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoDarknesslimitSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoMeanlengthSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoMeanthresholdSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoPercentnewSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoFiltermodeCombo, currentIndexChanged( int ) ) + SETUP_VFILTER_OPTION( atmoShowdotsCheck, stateChanged( int ) ) + } + else + { + _parent->removeTab( _parent->indexOf( ui.tab_atmo ) ); + } #undef SETUP_VFILTER #undef SETUP_VFILTER_OPTION @@ -209,6 +231,8 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : CONNECT( ui.cropBotPx, valueChanged( int ), this, cropChange() ); CONNECT( ui.cropLeftPx, valueChanged( int ), this, cropChange() ); CONNECT( ui.cropRightPx, valueChanged( int ), this, cropChange() ); + CONNECT( ui.leftRightCropSync, toggled ( bool ), this, cropChange() ); + CONNECT( ui.topBotCropSync, toggled ( bool ), this, cropChange() ); CONNECT( ui.topBotCropSync, toggled( bool ), ui.cropBotPx, setDisabled( bool ) ); CONNECT( ui.leftRightCropSync, toggled( bool ), @@ -221,50 +245,68 @@ ExtVideo::~ExtVideo() void ExtVideo::cropChange() { - p_vout = ( vout_thread_t * )vlc_object_find( p_intf, - VLC_OBJECT_VOUT, FIND_CHILD ); + if( ui.topBotCropSync->isChecked() ) + ui.cropBotPx->setValue( ui.cropTopPx->value() ); + if( ui.leftRightCropSync->isChecked() ) + ui.cropRightPx->setValue( ui.cropLeftPx->value() ); + + p_vout = THEMIM->getVout(); if( p_vout ) { var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() ); var_SetInteger( p_vout, "crop-bottom", ui.cropBotPx->value() ); var_SetInteger( p_vout, "crop-left", ui.cropLeftPx->value() ); var_SetInteger( p_vout, "crop-right", ui.cropRightPx->value() ); + vlc_object_release( p_vout ); } } -void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add ) +void ExtVideo::clean() +{ + ui.cropTopPx->setValue( 0 ); + ui.cropBotPx->setValue( 0 ); + ui.cropLeftPx->setValue( 0 ); + ui.cropRightPx->setValue( 0 ); +} + +void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) { char *psz_parser, *psz_string; const char *psz_filter_type; - /* Please leave p_libvlc_global. This is where cached modules are - * stored. We're not trying to find a module instance. */ - module_t *p_obj = module_Find( p_intf, psz_name ); + /* FIXME temporary hack */ + const char *psz_module_name = psz_name; + if( !strcmp( psz_name, "wall" ) || + !strcmp( psz_name, "panoramix" ) || + !strcmp( psz_name, "clone" ) ) + psz_module_name = "video_filter_wrapper"; + + module_t *p_obj = module_find( psz_module_name ); if( !p_obj ) { - msg_Err( p_intf, "Unable to find filter module \"%s\n.", psz_name ); + msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name ); return; } - if( module_IsCapable( p_obj, "video filter2" ) ) + if( module_provides( p_obj, "video filter" ) ) { - psz_filter_type = "video-filter"; + psz_filter_type = "vout-filter"; } - else if( module_IsCapable( p_obj, "video filter" ) ) + else if( module_provides( p_obj, "video filter2" ) ) { - psz_filter_type = "vout-filter"; + psz_filter_type = "video-filter"; } - else if( module_IsCapable( p_obj, "sub filter" ) ) + else if( module_provides( p_obj, "sub filter" ) ) { psz_filter_type = "sub-filter"; } else { - module_Put( p_obj ); + module_release (p_obj); msg_Err( p_intf, "Unknown video filter type." ); return; } - module_Put( p_obj ); + module_release (p_obj); psz_string = config_GetPsz( p_intf, psz_filter_type ); @@ -279,7 +321,10 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add ) psz_parser = psz_string; if( asprintf( &psz_string, ( *psz_string ) ? "%s:%s" : "%s%s", psz_string, psz_name ) == -1 ) + { + free( psz_parser ); return; + } free( psz_parser ); } else @@ -324,14 +369,10 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add ) ui.subpictureFilterText->setText( psz_string ); /* Try to set on the fly */ - p_vout = ( vout_thread_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); + p_vout = THEMIM->getVout(); if( p_vout ) { - if( !strcmp( psz_filter_type, "sub-filter" ) ) - var_SetString( p_vout->p_spu, psz_filter_type, psz_string ); - else - var_SetString( p_vout, psz_filter_type, psz_string ); + var_SetString( p_vout, psz_filter_type, psz_string ); vlc_object_release( p_vout ); } @@ -341,7 +382,6 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add ) void ExtVideo::updateFilters() { QString module = ModuleFromWidgetName( sender() ); - //std::cout << "Module name: " << module.toStdString() << std::endl; QCheckBox *checkbox = qobject_cast( sender() ); QGroupBox *groupbox = qobject_cast( sender() ); @@ -365,10 +405,10 @@ void ExtVideo::initComboBoxItems( QObject *widget ) { if( i_type == CONFIG_ITEM_INTEGER || i_type == CONFIG_ITEM_BOOL ) - combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ), + combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ), p_item->pi_list[i_index] ); else if( i_type == CONFIG_ITEM_STRING ) - combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ), + combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ), p_item->ppsz_list[i_index] ); } } @@ -400,7 +440,7 @@ void ExtVideo::setWidgetValue( QObject *widget ) "Module instance %s not found, looking in config values.", qtu( module ) ); #endif - i_type = config_GetType( p_intf, qtu( option ) ) & 0xf0; + i_type = config_GetType( p_intf, qtu( option ) ) & VLC_VAR_CLASS; switch( i_type ) { case VLC_VAR_INTEGER: @@ -417,7 +457,7 @@ void ExtVideo::setWidgetValue( QObject *widget ) } else { - i_type = var_Type( p_obj, qtu( option ) ) & 0xf0; + i_type = var_Type( p_obj, qtu( option ) ) & VLC_VAR_CLASS; var_Get( p_obj, qtu( option ), &val ); vlc_object_release( p_obj ); } @@ -434,7 +474,6 @@ void ExtVideo::setWidgetValue( QObject *widget ) if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL ) { - int i_int = 0; if( slider ) slider->setValue( val.i_int ); else if( checkbox ) checkbox->setCheckState( val.i_int? Qt::Checked : Qt::Unchecked ); @@ -443,16 +482,15 @@ void ExtVideo::setWidgetValue( QObject *widget ) else if( lineedit ) { char str[30]; - sprintf( str, "%06X", val.i_int ); + snprintf( str, sizeof(str), "%06"PRIX64, val.i_int ); lineedit->setText( str ); } else if( combobox ) combobox->setCurrentIndex( - combobox->findData( val.i_int ) ); + combobox->findData( qlonglong(val.i_int) ) ); else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); } else if( i_type == VLC_VAR_FLOAT ) { - double f_float = 0; if( slider ) slider->setValue( ( int )( val.f_float*( double )slider->tickInterval() ) ); /* hack alert! */ else if( doublespinbox ) doublespinbox->setValue( val.f_float ); else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); @@ -484,14 +522,20 @@ void ExtVideo::updateFilterOptions() vlc_object_find_name( p_intf->p_libvlc, qtu( module ), FIND_CHILD ); + int i_type; + bool b_is_command; if( !p_obj ) { - msg_Err( p_intf, "Module %s not found.", qtu( module ) ); - return; + msg_Warn( p_intf, "Module %s not found. You'll need to restart the filter to take the change into account.", qtu( module ) ); + i_type = config_GetType( p_intf, qtu( option ) ); + b_is_command = false; + } + else + { + i_type = var_Type( p_obj, qtu( option ) ); + b_is_command = ( i_type & VLC_VAR_ISCOMMAND ); } - int i_type = var_Type( p_obj, qtu( option ) ); - bool b_is_command = ( i_type & VLC_VAR_ISCOMMAND ); if( !b_is_command ) { msg_Warn( p_intf, "Module %s's %s variable isn't a command. You'll need to restart the filter to take change into account.", @@ -510,7 +554,7 @@ void ExtVideo::updateFilterOptions() QLineEdit *lineedit = qobject_cast ( sender() ); QComboBox *combobox = qobject_cast ( sender() ); - i_type &= 0xf0; + i_type &= VLC_VAR_CLASS; if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL ) { int i_int = 0; @@ -561,7 +605,7 @@ void ExtVideo::updateFilterOptions() qtu( option ), i_type ); - vlc_object_release( p_obj ); + if( p_obj ) vlc_object_release( p_obj ); } #if 0 @@ -601,8 +645,7 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent ) ExtV4l2::~ExtV4l2() { - if( box ) - delete box; + delete box; } void ExtV4l2::showEvent( QShowEvent *event ) @@ -644,7 +687,7 @@ void ExtV4l2::Refresh( void ) const char *psz_var = text.p_list->p_values[i].psz_string; var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &name, NULL ); const char *psz_label = name.psz_string; - msg_Dbg( p_intf, "v4l2 control \"%x\": %s (%s)", + msg_Dbg( p_intf, "v4l2 control \"%"PRIx64"\": %s (%s)", val.p_list->p_values[i].i_int, psz_var, name.psz_string ); int i_type = var_Type( p_obj, psz_var ); @@ -668,12 +711,11 @@ void ExtV4l2::Refresh( void ) { combobox->addItem( text2.p_list->p_values[j].psz_string, - val2.p_list->p_values[j].i_int ); + qlonglong( val2.p_list->p_values[j].i_int) ); if( i_val == val2.p_list->p_values[j].i_int ) combobox->setCurrentIndex( j ); } - var_Change( p_obj, psz_var, VLC_VAR_FREELIST, - &val2, &text2 ); + var_FreeList( &val2, &text2 ); CONNECT( combobox, currentIndexChanged( int ), this, ValueChange( int ) ); @@ -738,7 +780,7 @@ void ExtV4l2::Refresh( void ) } free( name.psz_string ); } - var_Change( p_obj, "controls", VLC_VAR_FREELIST, &val, &text ); + var_FreeList( &val, &text ); vlc_object_release( p_obj ); } else @@ -775,7 +817,7 @@ void ExtV4l2::ValueChange( int value ) var_SetBool( p_obj, psz_var, value ); break; case VLC_VAR_VOID: - var_SetVoid( p_obj, psz_var ); + var_TriggerCallback( p_obj, psz_var ); break; } free( psz_var ); @@ -805,22 +847,13 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : smallFont.setPointSize( smallFont.pointSize() - 3 ); ui.setupUi( this ); - 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] ), - QVariant( i ) ); - } - CONNECT( ui.presetsCombo, activated( int ), this, setPreset( int ) ); - BUTTONACT( ui.enableCheck, enable() ); - BUTTONACT( ui.eq2PassCheck, set2Pass() ); - - CONNECT( ui.preampSlider, valueChanged( int ), this, setPreamp() ); + /* Setup of presetsComboBox */ + presetsComboBox = ui.presetsCombo; + CONNECT( presetsComboBox, activated( int ), this, setCorePreset( int ) ); + /* Add the sliders for the Bands */ QGridLayout *grid = new QGridLayout( ui.frame ); grid->setMargin( 0 ); for( int i = 0 ; i < BANDS ; i++ ) @@ -828,63 +861,114 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : 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, setCoreBands() ); + band_texts[i] = new QLabel( band_frequencies[i] + "\n0.0dB" ); band_texts[i]->setFont( smallFont ); + grid->addWidget( bands[i], 0, i ); grid->addWidget( band_texts[i], 1, i ); } - /* Write down initial values */ - aout_instance_t *p_aout = ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); - char *psz_af; - char *psz_bands; + /* Add the listed presets */ + for( int i = 0 ; i < NB_PRESETS ; i ++ ) + { + presetsComboBox->addItem( qtr( preset_list_text[i] ), + QVariant( preset_list[i] ) ); + } + + /* Connects */ + BUTTONACT( ui.enableCheck, enable() ); + BUTTONACT( ui.eq2PassCheck, set2Pass() ); + CONNECT( ui.preampSlider, valueChanged( int ), this, setPreamp() ); + + /* Do the update from the value of the core */ + updateUIFromCore(); +} + +Equalizer::~Equalizer() +{ +} + +void Equalizer::clean() +{ + enable(); +} +/* Write down initial values */ +void Equalizer::updateUIFromCore() +{ + char *psz_af, *psz_pres, *psz_bands; float f_preamp; + int i_preset; + + aout_instance_t *p_aout = THEMIM->getAout(); if( p_aout ) { psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); + psz_pres = var_GetString( p_aout, "equalizer-preset" ); if( var_GetBool( p_aout, "equalizer-2pass" ) ) ui.eq2PassCheck->setChecked( true ); - psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" ); f_preamp = var_GetFloat( p_aout, "equalizer-preamp" ); + psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" ); + i_preset = presetsComboBox->findData( QVariant( psz_pres ) ); vlc_object_release( p_aout ); } else { psz_af = config_GetPsz( p_intf, "audio-filter" ); + psz_pres = config_GetPsz( p_intf, "equalizer-preset" ); if( config_GetInt( p_intf, "equalizer-2pass" ) ) ui.eq2PassCheck->setChecked( true ); - psz_bands = config_GetPsz( p_intf, "equalizer-bands" ); f_preamp = config_GetFloat( p_intf, "equalizer-preamp" ); + psz_bands = config_GetPsz( p_intf, "equalizer-bands" ); + i_preset = presetsComboBox->findData( QVariant( psz_pres ) ); } if( psz_af && strstr( psz_af, "equalizer" ) != NULL ) ui.enableCheck->setChecked( true ); - free( psz_af ); enable( ui.enableCheck->isChecked() ); - setValues( psz_bands, f_preamp ); -} + presetsComboBox->setCurrentIndex( i_preset ); -Equalizer::~Equalizer() -{ + ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) ); + + if( psz_bands && strlen( psz_bands ) > 1 ) + { + char *psz_bands_orig = psz_bands; + for( int i = 0; i < BANDS; i++ ) + { + const float f = us_strtod(psz_bands, &psz_bands ); + bands[i]->setValue( (int)( ( f + 20 ) * 10 ) ); + if( psz_bands == NULL || *psz_bands == '\0' ) break; + psz_bands++; + if( *psz_bands == '\0' ) break; + } + free( psz_bands_orig ); + } + else free( psz_bands ); + + free( psz_af ); + free( psz_pres ); } +/* Functin called when enableButton is toggled */ void Equalizer::enable() { bool en = ui.enableCheck->isChecked(); - aout_EnableFilter( VLC_OBJECT( p_intf ), "equalizer", - en ? true : false ); -// aout_EnableFilter( VLC_OBJECT( p_intf ), "upmixer", -// en ? true : false ); -// aout_EnableFilter( VLC_OBJECT( p_intf ), "vsurround", -// en ? true : false ); - enable( en ); + aout_EnableFilter( THEPL, "equalizer", en ); +// aout_EnableFilter( THEPL, "upmixer", en ); +// aout_EnableFilter( THEPL, "vsurround", en ); + enable( en ); + + if( presetsComboBox->currentIndex() < 0 ) + presetsComboBox->setCurrentIndex( 0 ); + } void Equalizer::enable( bool en ) { ui.eq2PassCheck->setEnabled( en ); + presetsComboBox->setEnabled( en ); + ui.presetLabel->setEnabled( en ); ui.preampLabel->setEnabled( en ); ui.preampSlider->setEnabled( en ); for( int i = 0 ; i< BANDS; i++ ) @@ -893,124 +977,117 @@ void Equalizer::enable( bool en ) } } +/* Function called when the set2Pass button is activated */ void Equalizer::set2Pass() { - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); + aout_instance_t *p_aout= THEMIM->getAout(); bool b_2p = ui.eq2PassCheck->isChecked(); - if( p_aout == NULL ) - config_PutInt( p_intf, "equalizer-2pass", b_2p ); - else + if( p_aout ) { var_SetBool( p_aout, "equalizer-2pass", b_2p ); - config_PutInt( p_intf, "equalizer-2pass", b_2p ); - for( int i = 0; i < p_aout->i_nb_inputs; i++ ) - { - p_aout->pp_inputs[i]->b_restart = true; - } vlc_object_release( p_aout ); } + config_PutInt( p_intf, "equalizer-2pass", b_2p ); } +/* Function called when the preamp slider is moved */ void Equalizer::setPreamp() { - float f= ( float )( ui.preampSlider->value() ) /10 - 20; - char psz_val[5]; - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); + const float f = ( float )( ui.preampSlider->value() ) /10 - 20; + aout_instance_t *p_aout = THEMIM->getAout(); - 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 ); + //delCallbacks( p_aout ); var_SetFloat( p_aout, "equalizer-preamp", f ); - addCallbacks( p_aout ); + //addCallbacks( p_aout ); vlc_object_release( p_aout ); } config_PutFloat( p_intf, "equalizer-preamp", f ); } -void Equalizer::setBand() +void Equalizer::setCoreBands() { - 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; } - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); + const char *psz_values = values.toAscii().constData(); + + aout_instance_t *p_aout = THEMIM->getAout(); if( p_aout ) { - delCallbacks( p_aout ); + //delCallbacks( p_aout ); var_SetString( p_aout, "equalizer-bands", psz_values ); - addCallbacks( p_aout ); + //addCallbacks( p_aout ); vlc_object_release( p_aout ); } } -void Equalizer::setValues( char *psz_bands, float f_preamp ) + +char * Equalizer::createValuesFromPreset( int i_preset ) { - 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; - p++; - 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" ) ); + QString values; + + /* Create the QString in Qt */ + for( int i = 0 ; i< BANDS ;i++ ) + values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] ); + + /* Convert it to char * */ + return strdup( values.toAscii().constData() ); } -void Equalizer::setPreset( int preset ) +void Equalizer::setCorePreset( int i_preset ) { - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); + if( i_preset < 0 ) + return; - char psz_values[102]; memset( psz_values, 0, 102 ); - char psz_values2[102];memset( psz_values2, 0, 102 ); - for( int i = 0 ; i< BANDS ;i++ ) + /* Update pre-amplification in the UI */ + float f_preamp = eqz_preset_10b[i_preset]->f_preamp; + ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) ); + ui.preampLabel->setText( qtr( "Preamp\n" ) + + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) ); + + char *psz_values = createValuesFromPreset( i_preset ); + if( !psz_values ) return ; + + char *p = psz_values; + for( int i = 0; i < BANDS && *p; i++ ) { - strcpy( psz_values2, psz_values ); + const float f = us_strtod( p, &p ); - sprintf( psz_values, "%s %5.1f", - psz_values2, eqz_preset_10b[preset]->f_amp[i] ); + 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 ) + p++; /* skip separator */ } + /* Apply presets to audio output */ + aout_instance_t *p_aout= THEMIM->getAout(); if( p_aout ) { - delCallbacks( p_aout ); + var_SetString( p_aout , "equalizer-preset" , preset_list[i_preset] ); + var_SetString( p_aout, "equalizer-bands", psz_values ); var_SetFloat( p_aout, "equalizer-preamp", - eqz_preset_10b[preset]->f_preamp ); - addCallbacks( p_aout ); + eqz_preset_10b[i_preset]->f_preamp ); vlc_object_release( p_aout ); } config_PutPsz( p_intf, "equalizer-bands", psz_values ); + config_PutPsz( p_intf, "equalizer-preset", preset_list[i_preset] ); 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 ); + free( psz_values ); } static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, @@ -1018,7 +1095,8 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, { char *psz_preset = newval.psz_string; Equalizer *eq = ( Equalizer * )p_data; - eq->presetsComboBox->setCurrentIndex( eq->presetsComboBox->findText( qfu( psz_preset ) ) ); + int i_preset = eq->presetsComboBox->findData( QVariant( psz_preset ) ); + eq->presetsComboBox->setCurrentIndex( i_preset ); return VLC_SUCCESS; } @@ -1045,7 +1123,8 @@ void Equalizer::addCallbacks( aout_instance_t *p_aout ) **********************************************************************/ static const char *psz_control_names[] = { - "Roomsize", "Width" , "Wet", "Dry", "Damp" + "spatializer-roomsize", "spatializer-width", + "spatializer-wet", "spatializer-dry", "spatializer-damp" }; Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : @@ -1057,7 +1136,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : QGridLayout *layout = new QGridLayout( this ); layout->setMargin( 0 ); - enableCheck = new QCheckBox( qfu( "Enable spatializer" ) ); + enableCheck = new QCheckBox( qtr( "Enable spatializer" ) ); layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL ); for( int i = 0 ; i < NUM_SP_CTRL ; i++ ) @@ -1088,8 +1167,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : BUTTONACT( enableCheck, enable() ); /* Write down initial values */ - aout_instance_t *p_aout = ( aout_instance_t * ) - vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + aout_instance_t *p_aout = THEMIM->getAout(); char *psz_af; if( p_aout ) @@ -1123,8 +1201,7 @@ Spatializer::~Spatializer() void Spatializer::enable() { bool en = enableCheck->isChecked(); - aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer", - en ? true : false ); + aout_EnableFilter( THEPL, "spatializer", en ); enable( en ); } @@ -1144,16 +1221,12 @@ void Spatializer::setInitValues() 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 ); + aout_instance_t *p_aout = THEMIM->getAout(); 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 ) { @@ -1198,6 +1271,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QToolButton *updateButton; + b_userAction = true; + QGridLayout *mainLayout = new QGridLayout( this ); /* AV sync */ @@ -1223,12 +1298,12 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : AVSpin = new QDoubleSpinBox; AVSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ); AVSpin->setDecimals( 3 ); - AVSpin->setMinimum( -100 ); - AVSpin->setMaximum( 100 ); + AVSpin->setMinimum( -600.0 ); + AVSpin->setMaximum( 600.0 ); AVSpin->setSingleStep( 0.1 ); AVSpin->setToolTip( qtr( "A positive value means that\n" "the audio is ahead of the video" ) ); - AVSpin->setSuffix( "s" ); + AVSpin->setSuffix( " s" ); AVLayout->addWidget( AVSpin, 0, 2, 1, 1 ); mainLayout->addWidget( AVBox, 1, 0, 1, 5 ); @@ -1256,12 +1331,12 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : subsSpin = new QDoubleSpinBox; subsSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ); subsSpin->setDecimals( 3 ); - subsSpin->setMinimum( -100 ); - subsSpin->setMaximum( 100 ); + subsSpin->setMinimum( -600.0 ); + subsSpin->setMaximum( 600.0 ); subsSpin->setSingleStep( 0.1 ); subsSpin->setToolTip( qtr( "A positive value means that\n" "the subtitles are ahead of the video" ) ); - subsSpin->setSuffix( "s" ); + subsSpin->setSuffix( " s" ); subsLayout->addWidget( subsSpin, 0, 2, 1, 1 ); @@ -1279,7 +1354,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QLabel *subSpeedLabel = new QLabel; subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) ); - subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 ); + subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 ); subSpeedSpin = new QDoubleSpinBox; subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ); @@ -1287,14 +1362,13 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : subSpeedSpin->setMinimum( 1 ); subSpeedSpin->setMaximum( 100 ); subSpeedSpin->setSingleStep( 0.2 ); + subSpeedSpin->setSuffix( " fps" ); subsLayout->addWidget( subSpeedSpin, 1, 2, 1, 1 ); mainLayout->addWidget( subsBox, 2, 0, 2, 5 ); updateButton = new QToolButton; updateButton->setAutoRaise( true ); - updateButton->setText( "u" ); - updateButton->setToolTip( qtr( "Force update of this dialog's values" ) ); mainLayout->addWidget( updateButton, 0, 4, 1, 1 ); @@ -1309,50 +1383,61 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ; CONNECT( subSpeedSpin, valueChanged ( double ), this, adjustSubsSpeed( double ) ); - BUTTONACT( updateButton, update() ); + + CONNECT( THEMIM->getIM(), synchroChanged(), this, update() ); + BUTTON_SET_ACT_I( updateButton, "", update, + qtr( "Force update of this dialog's values" ), update() ); /* Set it */ update(); } +void SyncControls::clean() +{ + b_userAction = false; + AVSpin->setValue( 0.0 ); + subsSpin->setValue( 0.0 ); + subSpeedSpin->setValue( 1.0 ); + b_userAction = true; +} + void SyncControls::update() { + b_userAction = false; + int64_t i_delay; if( THEMIM->getInput() ) { - i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" ); - AVSpin->setValue( ( (double)i_delay ) / 1000000 ); i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" ); + AVSpin->setValue( ( (double)i_delay ) / 1000000 ); + i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" ); subsSpin->setValue( ( (double)i_delay ) / 1000000 ); subSpeedSpin->setValue( var_GetFloat( THEMIM->getInput(), "sub-fps" ) ); } + b_userAction = true; } void SyncControls::advanceAudio( double f_advance ) { - if( THEMIM->getInput() ) + if( THEMIM->getInput() && b_userAction ) { - int64_t i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" ); - i_delay += f_advance * 1000000; + int64_t i_delay = f_advance * 1000000; var_SetTime( THEMIM->getInput(), "audio-delay", i_delay ); - msg_Dbg( p_intf, "I am advancing Audio %d", f_advance ); } } void SyncControls::advanceSubs( double f_advance ) { - if( THEMIM->getInput() ) + if( THEMIM->getInput() && b_userAction ) { - int64_t i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" ); - i_delay += f_advance * 1000000; + int64_t i_delay = f_advance * 1000000; var_SetTime( THEMIM->getInput(), "spu-delay", i_delay ); - msg_Dbg( p_intf, "I am advancing subtitles %d", f_advance ); } } void SyncControls::adjustSubsSpeed( double f_fps ) { - if( THEMIM->getInput() ) + if( THEMIM->getInput() && b_userAction ) { var_SetFloat( THEMIM->getInput(), "sub-fps", f_fps ); }