X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=1482ca07fa261ba2400c883faf12a4c780bcb5ca;hb=fce3f85b6fa118a8212ec90b1a6d9469a6556197;hp=1d71c52e212d5d7ef358070d2c01a4b5228a8c42;hpb=42fef87c4f281f304b7d56c0cbfde0b7d1912ab6;p=vlc diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 1d71c52e21..1482ca07fa 100644 --- 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,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -35,15 +36,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 +93,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 +133,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,7 +196,7 @@ 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 ) @@ -221,50 +224,56 @@ ExtVideo::~ExtVideo() void ExtVideo::cropChange() { - p_vout = ( vout_thread_t * )vlc_object_find( p_intf, - VLC_OBJECT_VOUT, FIND_CHILD ); + 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 ); + module_t *p_obj = module_find( psz_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 filter2" ) ) { psz_filter_type = "video-filter"; } - else if( module_IsCapable( p_obj, "video filter" ) ) + else if( module_provides( p_obj, "video filter" ) ) { psz_filter_type = "vout-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 ); @@ -327,8 +336,7 @@ 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" ) ) @@ -344,7 +352,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() ); @@ -437,7 +444,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 ); @@ -455,7 +461,6 @@ void ExtVideo::setWidgetValue( QObject *widget ) } 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__ ); @@ -487,14 +492,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.", @@ -564,7 +575,7 @@ void ExtVideo::updateFilterOptions() qtu( option ), i_type ); - vlc_object_release( p_obj ); + if( p_obj ) vlc_object_release( p_obj ); } #if 0 @@ -604,8 +615,7 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent ) ExtV4l2::~ExtV4l2() { - if( box ) - delete box; + delete box; } void ExtV4l2::showEvent( QShowEvent *event ) @@ -853,33 +863,36 @@ Equalizer::~Equalizer() { } +void Equalizer::clean() +{ + enable(); +} /* Write down initial values */ void Equalizer::updateUIFromCore() { - char *psz_af; + char *psz_af, *psz_pres; float f_preamp; int i_preset; - 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(); 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 ); f_preamp = var_GetFloat( p_aout, "equalizer-preamp" ); - i_preset = presetsComboBox->findData( QVariant( - var_GetString( p_aout, "equalizer-preset" ) ) ); + 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 ); f_preamp = config_GetFloat( p_intf, "equalizer-preamp" ); - i_preset = presetsComboBox->findData( QVariant( - config_GetPsz( p_intf, "equalizer-preset" ) ) ); + i_preset = presetsComboBox->findData( QVariant( psz_pres ) ); } if( psz_af && strstr( psz_af, "equalizer" ) != NULL ) ui.enableCheck->setChecked( true ); @@ -888,6 +901,7 @@ void Equalizer::updateUIFromCore() presetsComboBox->setCurrentIndex( i_preset ); free( psz_af ); + free( psz_pres ); } /* Functin called when enableButton is toggled */ @@ -923,8 +937,7 @@ 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 ) @@ -945,8 +958,7 @@ void Equalizer::set2Pass() void Equalizer::setPreamp() { 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 ); + aout_instance_t *p_aout = THEMIM->getAout(); ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f, 'f', 1 ) + qtr( "dB" ) ); @@ -975,8 +987,7 @@ void Equalizer::setCoreBands() } 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 ); + aout_instance_t *p_aout = THEMIM->getAout(); if( p_aout ) { //delCallbacks( p_aout ); @@ -1002,7 +1013,7 @@ void Equalizer::updateUISliderValues( int i_preset ) bands[i]->setValue( (int)( ( f + 20 ) * 10 ) ); - band_texts[i]->setText( band_frequencies[i] + "\n" + band_texts[i]->setText( band_frequencies[i] + "\n" + QString("%1").arg( f, 5, 'f', 1 ) + "dB" ); if( p == NULL || *p == '\0' ) break; @@ -1038,8 +1049,7 @@ void Equalizer::setCorePreset( 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 ); + aout_instance_t *p_aout= THEMIM->getAout(); if( p_aout ) { delCallbacks( p_aout ); @@ -1090,7 +1100,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 ) : @@ -1133,8 +1144,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 ) @@ -1189,8 +1199,7 @@ void Spatializer::setInitValues() void Spatializer::setValues( float *controlVars ) { - 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++ ) { @@ -1240,6 +1249,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QToolButton *updateButton; + b_userAction = true; + QGridLayout *mainLayout = new QGridLayout( this ); /* AV sync */ @@ -1265,12 +1276,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( -100.0 ); + AVSpin->setMaximum( 100.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 ); @@ -1298,12 +1309,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( -100.0 ); + subsSpin->setMaximum( 100.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 ); @@ -1329,6 +1340,7 @@ 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 ); @@ -1349,6 +1361,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ; CONNECT( subSpeedSpin, valueChanged ( double ), this, adjustSubsSpeed( double ) ); + + CONNECT( THEMIM->getIM(), synchroChanged(), this, update() ); BUTTON_SET_ACT_I( updateButton, "", update, qtr( "Force update of this dialog's values" ), update() ); @@ -1356,44 +1370,52 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : 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 ); }