X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=41fed07c38885ad15b814688636d7debdc68d7ae;hb=b0b4694b61f1da491cd09a24bf56017a2ba1cca6;hp=c2d516e7ed3671c0cb8c86ae612aacd05cf07732;hpb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;p=vlc diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index c2d516e7ed..41fed07c38 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -22,6 +22,8 @@ * 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 @@ -33,20 +35,26 @@ #include #include #include +#include +#include #include "components/extended_panels.hpp" #include "dialogs/preferences.hpp" #include "qt4.hpp" #include "input_manager.hpp" +#include "util/qt_dirs.hpp" #include "../../audio_filter/equalizer_presets.h" #include #include #include #include +#include #include /* us_strtod */ +static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char *psz_name, bool b_add ); + #if 0 class ConfClickHandler : public QObject { @@ -70,7 +78,7 @@ private: }; #endif -QString ModuleFromWidgetName( QObject *obj ) +const QString ModuleFromWidgetName( QObject *obj ) { return obj->objectName().replace( "Enable","" ); } @@ -96,7 +104,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : QObject( _parent ), p_intf( _p_intf ) { ui.setupUi( _parent ); - p_vout = NULL; #define SETUP_VFILTER( widget ) \ { \ @@ -135,11 +142,17 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER( extract ) SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) ) + SETUP_VFILTER( posterize ) + SETUP_VFILTER_OPTION( posterizeLevelSpin, valueChanged( int ) ) + SETUP_VFILTER( colorthres ) SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) ) SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) ) + SETUP_VFILTER( sepia ) + SETUP_VFILTER_OPTION( sepiaIntensitySpin, valueChanged( int ) ) + SETUP_VFILTER( invert ) SETUP_VFILTER( gradient ) @@ -152,7 +165,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER( motiondetect ) - SETUP_VFILTER( noise ) +// SETUP_VFILTER( noise ) SETUP_VFILTER( psychedelic ) @@ -194,6 +207,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() ) SETUP_VFILTER_OPTION( eraseYSpin, valueChanged( int ) ) SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) ) + BUTTONACT( ui.eraseBrowseBtn, browseEraseFile() ); SETUP_VFILTER( marq ) SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) ) @@ -203,7 +217,31 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : 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 ) ) + BUTTONACT( ui.logoBrowseBtn, browseLogo() ); + + SETUP_VFILTER( gradfun ) + SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) ) + + SETUP_VFILTER( grain ) + SETUP_VFILTER_OPTION( grainVarianceSlider, 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 @@ -220,10 +258,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ui.cropRightPx, setDisabled( bool ) ); } -ExtVideo::~ExtVideo() -{ -} - void ExtVideo::cropChange() { if( ui.topBotCropSync->isChecked() ) @@ -231,7 +265,7 @@ void ExtVideo::cropChange() if( ui.leftRightCropSync->isChecked() ) ui.cropRightPx->setValue( ui.cropLeftPx->value() ); - p_vout = THEMIM->getVout(); + vout_thread_t *p_vout = THEMIM->getVout(); if( p_vout ) { var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() ); @@ -250,7 +284,7 @@ void ExtVideo::clean() ui.cropRightPx->setValue( 0 ); } -void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) +static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char *psz_name, bool b_add ) { char *psz_parser, *psz_string; const char *psz_filter_type; @@ -262,13 +296,17 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) return; } - if( module_provides( p_obj, "video filter2" ) ) + if( module_provides( p_obj, "video splitter" ) ) + { + psz_filter_type = "video-splitter"; + } + else if( module_provides( p_obj, "video filter2" ) ) { psz_filter_type = "video-filter"; } - else if( module_provides( p_obj, "video filter" ) ) + else if( module_provides( p_obj, "sub source" ) ) { - psz_filter_type = "vout-filter"; + psz_filter_type = "sub-source"; } else if( module_provides( p_obj, "sub filter" ) ) { @@ -335,22 +373,21 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) } /* Vout is not kept, so put that in the config */ config_PutPsz( p_intf, psz_filter_type, psz_string ); - if( !strcmp( psz_filter_type, "video-filter" ) ) - ui.videoFilterText->setText( psz_string ); - else if( !strcmp( psz_filter_type, "vout-filter" ) ) - ui.voutFilterText->setText( psz_string ); - else if( !strcmp( psz_filter_type, "sub-filter" ) ) - ui.subpictureFilterText->setText( psz_string ); /* Try to set on the fly */ - p_vout = THEMIM->getVout(); - if( p_vout ) + if( !strcmp( psz_filter_type, "video-splitter" ) ) { - if( !strcmp( psz_filter_type, "sub-filter" ) ) - var_SetString( p_vout->p_spu, psz_filter_type, psz_string ); - else + playlist_t *p_playlist = pl_Get( p_intf ); + var_SetString( p_playlist, psz_filter_type, psz_string ); + } + else + { + vout_thread_t *p_vout = THEMIM->getVout(); + if( p_vout ) + { var_SetString( p_vout, psz_filter_type, psz_string ); - vlc_object_release( p_vout ); + vlc_object_release( p_vout ); + } } free( psz_string ); @@ -363,15 +400,30 @@ void ExtVideo::updateFilters() QCheckBox *checkbox = qobject_cast( sender() ); QGroupBox *groupbox = qobject_cast( sender() ); - ChangeVFiltersString( qtu( module ), + ChangeVFiltersString( p_intf, qtu( module ), checkbox ? checkbox->isChecked() : groupbox->isChecked() ); } +void ExtVideo::browseLogo() +{ + QString file = QFileDialog::getOpenFileName( NULL, qtr( "Logo filenames" ), + p_intf->p_sys->filepath, "Images (*.png *.jpg);;All (*)" ); + ui.logoFileText->setText( toNativeSeparators( file ) ); +} + +void ExtVideo::browseEraseFile() +{ + QString file = QFileDialog::getOpenFileName( NULL, qtr( "Image mask" ), + p_intf->p_sys->filepath, "Images (*.png *.jpg);;All (*)" ); + ui.eraseMaskText->setText( toNativeSeparators( file ) ); +} + void ExtVideo::initComboBoxItems( QObject *widget ) { QComboBox *combobox = qobject_cast( widget ); if( !combobox ) return; + QString option = OptionFromWidgetName( widget ); module_config_t *p_item = config_FindConfig( VLC_OBJECT( p_intf ), qtu( option ) ); @@ -382,10 +434,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] ); } } @@ -417,7 +469,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: @@ -434,7 +486,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 ); } @@ -459,11 +511,11 @@ void ExtVideo::setWidgetValue( QObject *widget ) else if( lineedit ) { char str[30]; - snprintf( str, sizeof(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 ) @@ -481,11 +533,12 @@ void ExtVideo::setWidgetValue( QObject *widget ) free( val.psz_string ); } else - msg_Err( p_intf, - "Module %s's %s variable is of an unsupported type ( %d )", - qtu( module ), - qtu( option ), - i_type ); + if( p_obj ) + msg_Err( p_intf, + "Module %s's %s variable is of an unsupported type ( %d )", + qtu( module ), + qtu( option ), + i_type ); } void ExtVideo::updateFilterOptions() @@ -510,6 +563,8 @@ void ExtVideo::updateFilterOptions() else { i_type = var_Type( p_obj, qtu( option ) ); + if( i_type == 0 ) + i_type = config_GetType( p_intf, qtu( option ) ); b_is_command = ( i_type & VLC_VAR_ISCOMMAND ); } @@ -531,7 +586,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; @@ -611,18 +666,16 @@ void ExtVideo::gotoConf( QObject* src ) **********************************************************************/ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent ) - : QWidget( _parent ), p_intf( _p_intf ) + : QWidget( _parent ), p_intf( _p_intf ), box( NULL ) { - ui.setupUi( this ); - - BUTTONACT( ui.refresh, Refresh() ); - - box = NULL; -} - -ExtV4l2::~ExtV4l2() -{ - delete box; + QVBoxLayout *layout = new QVBoxLayout( this ); + help = new QLabel( qtr("No v4l2 instance found.\n" + "Please check that the device has been opened with VLC and is playing.\n\n" + "Controls will automatically appear here.") + , this ); + help->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + layout->addWidget( help ); + setLayout( layout ); } void ExtV4l2::showEvent( QShowEvent *event ) @@ -633,11 +686,11 @@ void ExtV4l2::showEvent( QShowEvent *event ) void ExtV4l2::Refresh( void ) { - vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE ); - ui.help->hide(); + vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD ); + help->hide(); if( box ) { - ui.vboxLayout->removeWidget( box ); + layout()->removeWidget( box ); delete box; box = NULL; } @@ -649,13 +702,13 @@ void ExtV4l2::Refresh( void ) if( i_ret < 0 ) { msg_Err( p_intf, "Oops, v4l2 object doesn't have a 'controls' variable." ); - ui.help->show(); + help->show(); vlc_object_release( p_obj ); return; } box = new QGroupBox( this ); - ui.vboxLayout->addWidget( box ); + layout()->addWidget( box ); QVBoxLayout *layout = new QVBoxLayout( box ); box->setLayout( layout ); @@ -664,7 +717,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 ); @@ -672,14 +725,14 @@ void ExtV4l2::Refresh( void ) { case VLC_VAR_INTEGER: { - QLabel *label = new QLabel( psz_label, box ); + QLabel *label = new QLabel( qtr( psz_label ), box ); QHBoxLayout *hlayout = new QHBoxLayout(); hlayout->addWidget( label ); int i_val = var_GetInteger( p_obj, psz_var ); if( i_type & VLC_VAR_HASCHOICE ) { QComboBox *combobox = new QComboBox( box ); - combobox->setObjectName( psz_var ); + combobox->setObjectName( qtr( psz_var ) ); vlc_value_t val2, text2; var_Change( p_obj, psz_var, VLC_VAR_GETCHOICES, @@ -688,7 +741,7 @@ 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 ); } @@ -701,7 +754,7 @@ void ExtV4l2::Refresh( void ) else { QSlider *slider = new QSlider( box ); - slider->setObjectName( psz_var ); + slider->setObjectName( qtr( psz_var ) ); slider->setOrientation( Qt::Horizontal ); vlc_value_t val2; var_Change( p_obj, psz_var, VLC_VAR_GETMIN, @@ -724,8 +777,8 @@ void ExtV4l2::Refresh( void ) } case VLC_VAR_BOOL: { - QCheckBox *button = new QCheckBox( psz_label, box ); - button->setObjectName( psz_var ); + QCheckBox *button = new QCheckBox( qtr( psz_label ), box ); + button->setObjectName( qtr( psz_var ) ); button->setChecked( var_GetBool( p_obj, psz_var ) ); CONNECT( button, clicked( bool ), this, @@ -737,8 +790,8 @@ void ExtV4l2::Refresh( void ) { if( i_type & VLC_VAR_ISCOMMAND ) { - QPushButton *button = new QPushButton( psz_label, box ); - button->setObjectName( psz_var ); + QPushButton *button = new QPushButton( qtr( psz_label ), box ); + button->setObjectName( qtr( psz_var ) ); CONNECT( button, clicked( bool ), this, ValueChange( bool ) ); @@ -746,7 +799,7 @@ void ExtV4l2::Refresh( void ) } else { - QLabel *label = new QLabel( psz_label, box ); + QLabel *label = new QLabel( qtr( psz_label ), box ); layout->addWidget( label ); } break; @@ -763,7 +816,9 @@ void ExtV4l2::Refresh( void ) else { msg_Dbg( p_intf, "Couldn't find v4l2 instance" ); - ui.help->show(); + help->show(); + if ( isVisible() ) + QTimer::singleShot( 2000, this, SLOT(Refresh()) ); } } @@ -775,7 +830,7 @@ void ExtV4l2::ValueChange( bool value ) void ExtV4l2::ValueChange( int value ) { QObject *s = sender(); - vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE ); + vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD ); if( p_obj ) { char *psz_var = strdup( qtu( s->objectName() ) ); @@ -794,7 +849,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 ); @@ -820,7 +875,7 @@ static const QString band_frequencies[] = Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : QWidget( _parent ) , p_intf( _p_intf ) { - QFont smallFont = QApplication::font( static_cast( 0 ) ); + QFont smallFont = QApplication::font(); smallFont.setPointSize( smallFont.pointSize() - 3 ); ui.setupUi( this ); @@ -828,8 +883,6 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : /* Setup of presetsComboBox */ presetsComboBox = ui.presetsCombo; - CONNECT( presetsComboBox, currentIndexChanged( int ), - this, updateUISliderValues( int ) ); CONNECT( presetsComboBox, activated( int ), this, setCorePreset( int ) ); /* Add the sliders for the Bands */ @@ -865,18 +918,10 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : updateUIFromCore(); } -Equalizer::~Equalizer() -{ -} - -void Equalizer::clean() -{ - enable(); -} /* Write down initial values */ void Equalizer::updateUIFromCore() { - char *psz_af, *psz_pres; + char *psz_af, *psz_pres, *psz_bands; float f_preamp; int i_preset; @@ -888,6 +933,7 @@ void Equalizer::updateUIFromCore() if( var_GetBool( p_aout, "equalizer-2pass" ) ) ui.eq2PassCheck->setChecked( true ); 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 ); } @@ -898,6 +944,7 @@ void Equalizer::updateUIFromCore() if( config_GetInt( p_intf, "equalizer-2pass" ) ) ui.eq2PassCheck->setChecked( true ); 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 ) @@ -906,6 +953,23 @@ void Equalizer::updateUIFromCore() presetsComboBox->setCurrentIndex( i_preset ); + 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 ); } @@ -914,12 +978,9 @@ void Equalizer::updateUIFromCore() 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 ); + aout_EnableFilter( THEPL, "equalizer", en ); +// aout_EnableFilter( THEPL, "upmixer", en ); +// aout_EnableFilter( THEPL, "vsurround", en ); enable( en ); if( presetsComboBox->currentIndex() < 0 ) @@ -946,18 +1007,12 @@ void Equalizer::set2Pass() 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 */ @@ -1003,40 +1058,8 @@ void Equalizer::setCoreBands() } } -void Equalizer::updateUISliderValues( int i_preset ) -{ - if( i_preset < 0 ) return; - - char *p = createValuesFromPreset( i_preset ); - char *psz = p; - float f_preamp = eqz_preset_10b[i_preset]->f_preamp; - - if ( p ) - { - for( int i = 0; i < BANDS; i++ ) - { - 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; - } - free( psz ); - } - ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) ); - ui.preampLabel->setText( qtr( "Preamp\n" ) - + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) ); -} - char * Equalizer::createValuesFromPreset( int i_preset ) { - char *psz_values; QString values; /* Create the QString in Qt */ @@ -1044,27 +1067,44 @@ char * Equalizer::createValuesFromPreset( int i_preset ) values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] ); /* Convert it to char * */ - if( !asprintf( &psz_values, "%s", values.toAscii().constData() ) ) - return NULL; - - return psz_values; + return strdup( values.toAscii().constData() ); } void Equalizer::setCorePreset( int i_preset ) { + if( i_preset < 0 ) + return; + + /* 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++ ) + { + 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 ) + 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[i_preset]->f_preamp ); - addCallbacks( p_aout ); vlc_object_release( p_aout ); } config_PutPsz( p_intf, "equalizer-bands", psz_values ); @@ -1077,6 +1117,8 @@ void Equalizer::setCorePreset( int i_preset ) static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED( p_this ); VLC_UNUSED( psz_cmd ); VLC_UNUSED( oldval ); + char *psz_preset = newval.psz_string; Equalizer *eq = ( Equalizer * )p_data; int i_preset = eq->presetsComboBox->findData( QVariant( psz_preset ) ); @@ -1102,23 +1144,193 @@ void Equalizer::addCallbacks( aout_instance_t *p_aout ) * Audio filters **********************************************************************/ +/********************************************************************** + * Dynamic range compressor + **********************************************************************/ + +typedef struct +{ + const char *psz_name; + const char *psz_descs; + const char *psz_units; + const float f_min; // min + const float f_max; // max + const float f_value; // value + const float f_resolution; // resolution +} comp_controls_t; + +static const comp_controls_t comp_controls[] = +{ + { "compressor-rms-peak", _("RMS/peak"), "", 0.0f, 1.0f, 0.00f, 0.001f }, + { "compressor-attack", _("Attack"), _(" ms"), 1.5f, 400.0f, 25.00f, 0.100f }, + { "compressor-release", _("Release"), _(" ms"), 2.0f, 800.0f, 100.00f, 0.100f }, + { "compressor-threshold", _("Threshold"), _(" dB"), -30.0f, 0.0f, -11.00f, 0.010f }, + { "compressor-ratio", _("Ratio"), ":1", 1.0f, 20.0f, 8.00f, 0.010f }, + { "compressor-knee", _("Knee\nradius"), _(" dB"), 1.0f, 10.0f, 2.50f, 0.010f }, + { "compressor-makeup-gain", _("Makeup\ngain"), _(" dB"), 0.0f, 24.0f, 7.00f, 0.010f }, +}; + +Compressor::Compressor( intf_thread_t *_p_intf, QWidget *_parent ) + : QWidget( _parent ) , p_intf( _p_intf ) +{ + QFont smallFont = QApplication::font(); + smallFont.setPointSize( smallFont.pointSize() - 2 ); + + QGridLayout *layout = new QGridLayout( this ); + + enableCheck = new QCheckBox( qtr( "Enable dynamic range compressor" ) ); + layout->addWidget( enableCheck, 0, 0, 1, NUM_CP_CTRL ); + + for( int i = 0 ; i < NUM_CP_CTRL ; i++ ) + { + const int i_min = (int)( comp_controls[i].f_min + / comp_controls[i].f_resolution ); + const int i_max = (int)( comp_controls[i].f_max + / comp_controls[i].f_resolution ); + const int i_val = (int)( comp_controls[i].f_value + / comp_controls[i].f_resolution ); + + compCtrl[i] = new QSlider( Qt::Vertical ); + compCtrl[i]->setMinimum( i_min ); + compCtrl[i]->setMaximum( i_max ); + compCtrl[i]->setValue( i_val ); + + oldControlVars[i] = comp_controls[i].f_value; + + CONNECT( compCtrl[i], valueChanged( int ), this, setInitValues() ); + + ctrl_texts[i] = new QLabel( qtr( comp_controls[i].psz_descs ) + "\n" ); + ctrl_texts[i]->setFont( smallFont ); + ctrl_texts[i]->setAlignment( Qt::AlignHCenter ); + + ctrl_readout[i] = new QLabel; + ctrl_readout[i]->setFont( smallFont ); + ctrl_readout[i]->setAlignment( Qt::AlignHCenter ); + + layout->addWidget( compCtrl[i], 1, i, Qt::AlignHCenter ); + layout->addWidget( ctrl_readout[i], 2, i, Qt::AlignHCenter ); + layout->addWidget( ctrl_texts[i], 3, i, Qt::AlignHCenter ); + } + + BUTTONACT( enableCheck, enable() ); + + /* Write down initial values */ + aout_instance_t *p_aout = THEMIM->getAout(); + char *psz_af; + + if( p_aout ) + { + psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); + for( int i = 0; i < NUM_CP_CTRL; i++ ) + { + controlVars[i] = var_GetFloat( p_aout, + comp_controls[i].psz_name ); + } + vlc_object_release( p_aout ); + } + else + { + psz_af = config_GetPsz( p_intf, "audio-filter" ); + for( int i = 0; i < NUM_CP_CTRL; i++ ) + { + controlVars[i] = config_GetFloat( p_intf, + comp_controls[i].psz_name ); + } + } + if( psz_af && strstr( psz_af, "compressor" ) != NULL ) + { + enableCheck->setChecked( true ); + } + free( psz_af ); + enable( enableCheck->isChecked() ); + updateSliders( controlVars ); + setValues(); +} + +void Compressor::enable() +{ + bool en = enableCheck->isChecked(); + aout_EnableFilter( THEPL, "compressor", en ); + enable( en ); +} + +void Compressor::enable( bool en ) +{ + for( int i = 0 ; i < NUM_CP_CTRL ; i++ ) + { + compCtrl[i]->setEnabled( en ); + ctrl_texts[i]->setEnabled( en ); + ctrl_readout[i]->setEnabled( en ); + } +} + +void Compressor::updateSliders( float * controlVars ) +{ + for( int i = 0 ; i < NUM_CP_CTRL ; i++ ) + { + if( oldControlVars[i] != controlVars[i] ) + { + compCtrl[i]->setValue( + (int)( controlVars[i] / comp_controls[i].f_resolution ) ); + } + } +} + +void Compressor::setInitValues() +{ + setValues(); +} + +void Compressor::setValues() +{ + aout_instance_t *p_aout = THEMIM->getAout(); + + for( int i = 0 ; i < NUM_CP_CTRL ; i++ ) + { + float f = (float)( compCtrl[i]->value() ) * ( comp_controls[i].f_resolution ); + ctrl_readout[i]->setText( QString::number( f, 'f', 1 ) + + qtr( comp_controls[i].psz_units ) ); + if( oldControlVars[i] != f ) + { + if( p_aout ) + { + var_SetFloat( p_aout, comp_controls[i].psz_name, f ); + } + config_PutFloat( p_intf, comp_controls[i].psz_name, f ); + oldControlVars[i] = f; + } + } + if( p_aout ) + { + vlc_object_release( p_aout ); + } +} + /********************************************************************** * Spatializer **********************************************************************/ -static const char *psz_control_names[] = +typedef struct { - "spatializer-roomsize", "spatializer-width", - "spatializer-wet", "spatializer-dry", "spatializer-damp" + const char *psz_name; + const char *psz_desc; +} spat_controls_t; + +static const spat_controls_t spat_controls[] = +{ + { "spatializer-roomsize", _("Size") }, + { "spatializer-width", _("Width") }, + { "spatializer-wet", _("Wet") }, + { "spatializer-dry", _("Dry") }, + { "spatializer-damp", _("Damp") }, }; -Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : - QWidget( _parent ) , p_intf( _p_intf ) +Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) + : QWidget( _parent ) , p_intf( _p_intf ) { - QFont smallFont = QApplication::font( static_cast( 0 ) ); - smallFont.setPointSize( smallFont.pointSize() - 3 ); + QFont smallFont = QApplication::font(); + smallFont.setPointSize( smallFont.pointSize() - 2 ); QGridLayout *layout = new QGridLayout( this ); - layout->setMargin( 0 ); enableCheck = new QCheckBox( qtr( "Enable spatializer" ) ); layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL ); @@ -1137,15 +1349,20 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : spatCtrl[i]->setValue( 0 ); spatCtrl[i]->setMinimum( -10 ); } + oldControlVars[i] = spatCtrl[i]->value(); + CONNECT( spatCtrl[i], valueChanged( int ), this, setInitValues() ); - ctrl_texts[i] = new QLabel( qfu( psz_control_names[i] ) + "\n" ); + + ctrl_texts[i] = new QLabel( qtr( spat_controls[i].psz_desc ) + "\n" ); ctrl_texts[i]->setFont( smallFont ); - ctrl_readout[i] = new QLabel( "" ); + + ctrl_readout[i] = new QLabel; ctrl_readout[i]->setFont( smallFont ); - layout->addWidget( spatCtrl[i], 1, i ); - layout->addWidget( ctrl_readout[i], 2, i ); - layout->addWidget( ctrl_texts[i], 3, i ); + + layout->addWidget( spatCtrl[i], 1, i, Qt::AlignHCenter ); + layout->addWidget( ctrl_readout[i], 2, i, Qt::AlignHCenter ); + layout->addWidget( ctrl_texts[i], 3, i, Qt::AlignHCenter ); } BUTTONACT( enableCheck, enable() ); @@ -1159,7 +1376,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); for( int i = 0; i < NUM_SP_CTRL ; i++ ) { - controlVars[i] = var_GetFloat( p_aout, psz_control_names[i] ); + controlVars[i] = var_GetFloat( p_aout, spat_controls[i].psz_name ); } vlc_object_release( p_aout ); } @@ -1168,25 +1385,20 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : psz_af = config_GetPsz( p_intf, "audio-filter" ); for( int i = 0; i < NUM_SP_CTRL ; i++ ) { - controlVars[i] = config_GetFloat( p_intf, psz_control_names[i] ); + controlVars[i] = config_GetFloat( p_intf, spat_controls[i].psz_name ); } } if( psz_af && strstr( psz_af, "spatializer" ) != NULL ) enableCheck->setChecked( true ); free( psz_af ); enable( enableCheck->isChecked() ); - setValues( controlVars ); -} - -Spatializer::~Spatializer() -{ + setValues(); } void Spatializer::enable() { bool en = enableCheck->isChecked(); - aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer", - en ? true : false ); + aout_EnableFilter( THEPL, "spatializer", en ); enable( en ); } @@ -1201,10 +1413,10 @@ void Spatializer::enable( bool en ) } void Spatializer::setInitValues() { - setValues( controlVars ); + setValues(); } -void Spatializer::setValues( float *controlVars ) +void Spatializer::setValues() { aout_instance_t *p_aout = THEMIM->getAout(); @@ -1219,9 +1431,9 @@ void Spatializer::setValues( float *controlVars ) { if( oldControlVars[i] != spatCtrl[i]->value() ) { - var_SetFloat( p_aout, psz_control_names[i], + var_SetFloat( p_aout, spat_controls[i].psz_name, ( float )spatCtrl[i]->value() ); - config_PutFloat( p_intf, psz_control_names[i], + config_PutFloat( p_intf, spat_controls[i].psz_name, ( float ) spatCtrl[i]->value() ); oldControlVars[i] = ( float ) spatCtrl[i]->value(); } @@ -1232,12 +1444,14 @@ void Spatializer::setValues( float *controlVars ) } void Spatializer::delCallbacks( aout_instance_t *p_aout ) { + VLC_UNUSED( p_aout ); // var_DelCallback( p_aout, "Spatializer-bands", EqzCallback, this ); // var_DelCallback( p_aout, "Spatializer-preamp", EqzCallback, this ); } void Spatializer::addCallbacks( aout_instance_t *p_aout ) { + VLC_UNUSED( p_aout ); // var_AddCallback( p_aout, "Spatializer-bands", EqzCallback, this ); // var_AddCallback( p_aout, "Spatializer-preamp", EqzCallback, this ); } @@ -1245,6 +1459,12 @@ void Spatializer::addCallbacks( aout_instance_t *p_aout ) #include #include +#define SUBSDELAY_CFG_MODE "subsdelay-mode" +#define SUBSDELAY_CFG_FACTOR "subsdelay-factor" +#define SUBSDELAY_MODE_ABSOLUTE 0 +#define SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY 1 +#define SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT 2 + SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QWidget( _parent ) , p_intf( _p_intf ) { @@ -1253,6 +1473,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QToolButton *moinsAV, *plusAV; QToolButton *moinssubs, *plussubs; QToolButton *moinssubSpeed, *plussubSpeed; + QToolButton *moinssubDuration, *plussubDuration; QToolButton *updateButton; @@ -1283,8 +1504,8 @@ 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.0 ); - AVSpin->setMaximum( 100.0 ); + 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" ) ); @@ -1316,8 +1537,8 @@ 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.0 ); - subsSpin->setMaximum( 100.0 ); + 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" ) ); @@ -1339,7 +1560,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 ); @@ -1350,6 +1571,30 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : subSpeedSpin->setSuffix( " fps" ); subsLayout->addWidget( subSpeedSpin, 1, 2, 1, 1 ); + moinssubDuration = new QToolButton; + moinssubDuration->setToolButtonStyle( Qt::ToolButtonTextOnly ); + moinssubDuration->setAutoRaise( true ); + moinssubDuration->setText( "-" ); + subsLayout->addWidget( moinssubDuration, 2, 1, 1, 1 ); + + plussubDuration = new QToolButton; + plussubDuration->setToolButtonStyle( Qt::ToolButtonTextOnly ); + plussubDuration->setAutoRaise( true ); + plussubDuration->setText( "+" ); + subsLayout->addWidget( plussubDuration, 2, 3, 1, 1 ); + + QLabel *subDurationLabel = new QLabel; + subDurationLabel->setText( qtr( "Subtitles duration factor:" ) ); + subsLayout->addWidget( subDurationLabel, 2, 0, 1, 1 ); + + subDurationSpin = new QDoubleSpinBox; + subDurationSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ); + subDurationSpin->setDecimals( 3 ); + subDurationSpin->setMinimum( 0 ); + subDurationSpin->setMaximum( 20 ); + subDurationSpin->setSingleStep( 0.2 ); + subsLayout->addWidget( subDurationSpin, 2, 2, 1, 1 ); + mainLayout->addWidget( subsBox, 2, 0, 2, 5 ); updateButton = new QToolButton; @@ -1364,10 +1609,14 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : CONNECT( plussubs, clicked(), subsSpin, stepUp () ); CONNECT( moinssubSpeed, clicked(), subSpeedSpin, stepDown () ); CONNECT( plussubSpeed, clicked(), subSpeedSpin, stepUp () ); + CONNECT( moinssubDuration, clicked(), subDurationSpin, stepDown () ); + CONNECT( plussubDuration, clicked(), subDurationSpin, stepUp () ); CONNECT( AVSpin, valueChanged ( double ), this, advanceAudio( double ) ) ; CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ; CONNECT( subSpeedSpin, valueChanged ( double ), this, adjustSubsSpeed( double ) ); + CONNECT( subDurationSpin, valueChanged ( double ), + this, adjustSubsDuration( double ) ); CONNECT( THEMIM->getIM(), synchroChanged(), this, update() ); BUTTON_SET_ACT_I( updateButton, "", update, @@ -1375,6 +1624,12 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : /* Set it */ update(); + updateSubsDuration(); +} + +SyncControls::~SyncControls() +{ + subsdelayClean(); } void SyncControls::clean() @@ -1383,6 +1638,8 @@ void SyncControls::clean() AVSpin->setValue( 0.0 ); subsSpin->setValue( 0.0 ); subSpeedSpin->setValue( 1.0 ); + subsdelayClean(); + updateSubsDuration(); b_userAction = true; } @@ -1428,6 +1685,64 @@ void SyncControls::adjustSubsSpeed( double f_fps ) } } +void SyncControls::adjustSubsDuration( double f_factor ) +{ + if( THEMIM->getInput() && b_userAction ) + { + subsdelaySetFactor( f_factor ); + ChangeVFiltersString( p_intf, "subsdelay", f_factor > 0 ); + } +} + +void SyncControls::updateSubsDuration() +{ + int i_mode = var_InheritInteger( p_intf, SUBSDELAY_CFG_MODE ); + + switch (i_mode) + { + default: + case SUBSDELAY_MODE_ABSOLUTE: + subDurationSpin->setToolTip( qtr( "Extend subtitles duration by this value.\n" + "Set 0 to disable." ) ); + subDurationSpin->setSuffix( " s" ); + break; + case SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY: + subDurationSpin->setToolTip( qtr( "Multiply subtitles duration by this value.\n" + "Set 0 to disable." ) ); + subDurationSpin->setSuffix( "" ); + break; + case SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT: + subDurationSpin->setToolTip( qtr( "Recalculate subtitles duration according\n" + "to their content and this value.\n" + "Set 0 to disable." ) ); + subDurationSpin->setSuffix( "" ); + break; + } + + subDurationSpin->setValue( var_InheritFloat( p_intf, SUBSDELAY_CFG_FACTOR ) ); +} + +void SyncControls::subsdelayClean() +{ + /* Remove subsdelay filter */ + ChangeVFiltersString( p_intf, "subsdelay", false ); +} + +void SyncControls::subsdelaySetFactor( double f_factor ) +{ + /* Set the factor in the preferences */ + config_PutFloat( p_intf, SUBSDELAY_CFG_FACTOR, f_factor ); + + /* Try to find an instance of subsdelay, and set its factor */ + vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_find_name( p_intf->p_libvlc, "subsdelay", FIND_CHILD ); + if( p_obj ) + { + var_SetFloat( p_obj, SUBSDELAY_CFG_FACTOR, f_factor ); + vlc_object_release( p_obj ); + } +} + + /********************************************************************** * Video filters / Adjust **********************************************************************/