Commit 859847f1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: fix equalizer initialization

Close #5956
parent 0e26bab0
...@@ -992,24 +992,20 @@ void Equalizer::updateUIFromCore() ...@@ -992,24 +992,20 @@ void Equalizer::updateUIFromCore()
if( p_aout ) if( p_aout )
{ {
psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); 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" );
psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
vlc_object_release( p_aout ); vlc_object_release( p_aout );
} }
else else
{ {
psz_af = config_GetPsz( p_intf, "audio-filter" ); psz_af = config_GetPsz( p_intf, "audio-filter" );
psz_pres = config_GetPsz( p_intf, "equalizer-preset" ); }
if( config_GetInt( p_intf, "equalizer-2pass" ) )
psz_pres = var_InheritString( p_aout, "equalizer-preset" );
if( var_InheritBool( p_aout, "equalizer-2pass" ) )
ui.eq2PassCheck->setChecked( true ); ui.eq2PassCheck->setChecked( true );
f_preamp = config_GetFloat( p_intf, "equalizer-preamp" ); f_preamp = var_InheritFloat( p_aout, "equalizer-preamp" );
psz_bands = config_GetPsz( p_intf, "equalizer-bands" ); psz_bands = var_InheritString( p_aout, "equalizer-bands" );
i_preset = presetsComboBox->findData( QVariant( psz_pres ) ); i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
}
if( psz_af && strstr( psz_af, "equalizer" ) != NULL ) if( psz_af && strstr( psz_af, "equalizer" ) != NULL )
ui.enableCheck->setChecked( true ); ui.enableCheck->setChecked( true );
enable( ui.enableCheck->isChecked() ); enable( ui.enableCheck->isChecked() );
......
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
<property name="maximum"> <property name="maximum">
<number>400</number> <number>400</number>
</property> </property>
<property name="value">
<number>320</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="2" rowspan="2"> <item row="1" column="2" rowspan="2">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment