X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=9296c57eb9b3a0bc2465ddf764afaccba0275b24;hb=732ff9dccde394ed7a9176196b02c955ed6550df;hp=c2d516e7ed3671c0cb8c86ae612aacd05cf07732;hpb=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;p=vlc diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index c2d516e7ed..9296c57eb9 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -203,7 +203,24 @@ 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 ) ) + + 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 @@ -255,20 +272,30 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) char *psz_parser, *psz_string; const char *psz_filter_type; - module_t *p_obj = module_find( psz_name ); + /* FIXME temporary hack */ + const char *psz_module_name = psz_name; + if( !strcmp( psz_name, "magnify" ) || + !strcmp( psz_name, "puzzle" ) || + !strcmp( psz_name, "logo" ) || + !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\".", psz_name ); return; } - if( module_provides( p_obj, "video filter2" ) ) + if( module_provides( p_obj, "video filter" ) ) { - psz_filter_type = "video-filter"; + psz_filter_type = "vout-filter"; } - else if( module_provides( 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_provides( p_obj, "sub filter" ) ) { @@ -347,7 +374,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) if( p_vout ) { if( !strcmp( psz_filter_type, "sub-filter" ) ) - var_SetString( p_vout->p_spu, psz_filter_type, psz_string ); + var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string ); else var_SetString( p_vout, psz_filter_type, psz_string ); vlc_object_release( p_vout ); @@ -417,7 +444,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 +461,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 ); } @@ -531,7 +558,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; @@ -794,7 +821,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 ); @@ -828,8 +855,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 */ @@ -876,7 +901,7 @@ void Equalizer::clean() /* 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 +913,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 +924,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 +933,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 +958,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 +987,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 +1038,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 +1047,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 ); @@ -1339,7 +1359,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 );