[vlc-commits] Qt: remove SPDIF option
Jean-Baptiste Kempf
git at videolan.org
Sun Sep 8 18:47:51 CEST 2013
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep 8 18:24:38 2013 +0200| [8f974e5c15cee39c4908d560556d0fabf2cb3f91] | committer: Jean-Baptiste Kempf
Qt: remove SPDIF option
(cherry picked from commit d39285a18cd99fdc76a20fc317074e0ee862a504)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8f974e5c15cee39c4908d560556d0fabf2cb3f91
---
modules/gui/qt4/components/simple_preferences.cpp | 4 -
modules/gui/qt4/ui/sprefs_audio.ui | 104 +++++++++++++--------
2 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index a02557d..bed6003 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -506,7 +506,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage );
- CONFIG_BOOL( "spdif", spdifBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
@@ -535,7 +534,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
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;
updateAudioOptions( ui.outputModule->currentIndex() );
@@ -959,8 +957,6 @@ void SPrefsPanel::updateAudioOptions( int number)
}
#endif
optionWidgets["fileW"]->setVisible( ( value == "aout_file" ) );
- optionWidgets["spdifChB"]->setVisible( ( value == "alsa" || value == "oss" || value == "auhal" ||
- value == "directsound" || value == "waveout" ) );
}
diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 367e74c..eac4ab5 100644
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -8,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>707</width>
- <height>509</height>
+ <height>544</height>
</rect>
</property>
<property name="sizePolicy">
@@ -34,7 +34,16 @@
<item>
<widget class="QWidget" name="audioZone" native="true">
<layout class="QVBoxLayout" name="audioZoneLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -55,7 +64,16 @@
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -145,42 +163,22 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="outputLabel">
- <property name="minimumSize">
- <size>
- <width>250</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Output module:</string>
- </property>
- <property name="buddy">
- <cstring>outputModule</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="outputModule">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
<item row="1" column="0" colspan="2">
<widget class="QWidget" name="fileControl" native="true">
<layout class="QHBoxLayout">
<property name="spacing">
<number>0</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -212,17 +210,33 @@
</layout>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="spdifBox">
+ <item row="0" column="0">
+ <widget class="QLabel" name="outputLabel">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Output module:</string>
+ </property>
+ <property name="buddy">
+ <cstring>outputModule</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="outputModule">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>Use S/PDIF when available</string>
- </property>
</widget>
</item>
</layout>
@@ -451,7 +465,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_1">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="1">
@@ -541,7 +564,6 @@
<tabstop>outputModule</tabstop>
<tabstop>fileName</tabstop>
<tabstop>fileBrowseButton</tabstop>
- <tabstop>spdifBox</tabstop>
<tabstop>autoscaleBox</tabstop>
<tabstop>volNormBox</tabstop>
<tabstop>volNormSpin</tabstop>
More information about the vlc-commits
mailing list