Commit df0634dc authored by Pierre Lamot's avatar Pierre Lamot Committed by Jean-Baptiste Kempf

Qt: spref, remove Dolby Surround and headphone preference

Ref #19305
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 87622d2f
......@@ -499,8 +499,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
preferredAudioLanguage );
CONFIG_BOOL( "spdif", spdifBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL,
volNormSpin );
......@@ -526,7 +524,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/*Little mofification of ui.volumeValue to compile with Qt < 4.3 */
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets["volLW"] = ui.volumeValue;
optionWidgets["headphoneB"] = ui.headphoneEffect;
optionWidgets["spdifChB"] = ui.spdifBox;
optionWidgets["defaultVolume"] = ui.defaultVolume;
optionWidgets["resetVolumeCheckbox"] = ui.resetVolumeCheckbox;
......@@ -570,9 +567,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.volNormBox->setChecked( b_enabled );
ui.volNormSpin->setEnabled( b_enabled );
b_enabled = ( qs_filter.contains( "headphone" ) );
ui.headphoneEffect->setChecked( b_enabled );
/* Volume Label */
updateAudioVolume( ui.defaultVolume->value() ); // First time init
......@@ -1055,14 +1049,6 @@ void SPrefsPanel::apply()
if( !b_checked && qs_filter.contains( "normvol" ) )
qs_filter.removeAll( "normvol" );
b_checked =
qobject_cast<QCheckBox *>(optionWidgets["headphoneB"])->isChecked();
if( b_checked && !qs_filter.contains( "headphone" ) )
qs_filter.append( "headphone" );
if( !b_checked && qs_filter.contains( "headphone" ) )
qs_filter.removeAll( "headphone" );
config_PutPsz( p_intf, "audio-filter", qtu( qs_filter.join( ":" ) ) );
/* Default volume */
......
......@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>707</width>
<height>548</height>
<height>626</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -296,7 +296,7 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="visuLabel">
<property name="minimumSize">
<size>
......@@ -312,7 +312,7 @@
</property>
</widget>
</item>
<item row="8" column="2" colspan="2">
<item row="7" column="2" colspan="2">
<widget class="QComboBox" name="visualisation">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
......@@ -329,34 +329,6 @@
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="dolbyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Dolby Surround:</string>
</property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="replayLabel">
<property name="minimumSize">
......@@ -386,32 +358,6 @@
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QCheckBox" name="headphoneEffect">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Headphone surround effect</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QComboBox" name="detectionDolby">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy">
......@@ -460,7 +406,7 @@
</property>
</spacer>
</item>
<item row="7" column="2" colspan="2">
<item row="6" column="2" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -622,8 +568,6 @@
<tabstop>volNormBox</tabstop>
<tabstop>volNormSpin</tabstop>
<tabstop>replayCombo</tabstop>
<tabstop>detectionDolby</tabstop>
<tabstop>headphoneEffect</tabstop>
<tabstop>visualisation</tabstop>
<tabstop>preferredAudioLanguage</tabstop>
<tabstop>lastfm</tabstop>
......
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