X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=eca75df8947a20e2da68a0837bd64b98cebc9665;hb=b4c9cb160e24388a8c6092717f5257cdf46f146a;hp=203b53b3b684921a79a6c6b6e313caa71fbf0330;hpb=76099331dae4ca5b7da6fc3f615c183fd4470b66;p=vlc diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 203b53b3b6..eca75df894 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 @@ -257,10 +274,8 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) /* 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" ) || + if( !strcmp( psz_name, "wall" ) || + !strcmp( psz_name, "panoramix" ) || !strcmp( psz_name, "clone" ) ) psz_module_name = "video_filter_wrapper"; @@ -355,10 +370,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) p_vout = THEMIM->getVout(); if( p_vout ) { - if( !strcmp( psz_filter_type, "sub-filter" ) ) - var_SetString( vout_GetSpu( p_vout ), 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 ); } @@ -391,10 +403,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] ); } } @@ -426,7 +438,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: @@ -443,7 +455,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 ); } @@ -468,7 +480,7 @@ 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( @@ -540,7 +552,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; @@ -673,7 +685,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 ); @@ -803,7 +815,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 ); @@ -837,8 +849,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 */ @@ -885,7 +895,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; @@ -897,6 +907,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 ); } @@ -907,6 +918,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 ) @@ -915,6 +927,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 ); } @@ -952,18 +981,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 */ @@ -1009,37 +1032,6 @@ 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 ) { QString values; @@ -1054,19 +1046,39 @@ char * Equalizer::createValuesFromPreset( int i_preset ) 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 ); @@ -1285,8 +1297,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" ) ); @@ -1318,8 +1330,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" ) );