[vlc-commits] Revert "Qt: remove SPDIF option"
Jean-Baptiste Kempf
git at videolan.org
Sun Jan 26 18:59:29 CET 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 26 18:57:05 2014 +0100| [607c5b7af03a0db32ce212e6f6f31fae8f693aa8] | committer: Jean-Baptiste Kempf
Revert "Qt: remove SPDIF option"
This reverts commit d39285a18cd99fdc76a20fc317074e0ee862a504.
Conflicts:
modules/gui/qt4/components/simple_preferences.cpp
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=607c5b7af03a0db32ce212e6f6f31fae8f693aa8
---
modules/gui/qt4/components/simple_preferences.cpp | 4 +
modules/gui/qt4/ui/sprefs_audio.ui | 104 ++++++++-------------
2 files changed, 45 insertions(+), 63 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 2d1fea9..aaa8c48 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -515,6 +515,7 @@ 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 );
@@ -543,6 +544,7 @@ 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() );
@@ -968,6 +970,8 @@ void SPrefsPanel::updateAudioOptions( int number)
}
#endif
optionWidgets["fileW"]->setVisible( ( value == "afile" ) );
+ 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 efabef0..29b38dc 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>544</height>
+ <height>509</height>
</rect>
</property>
<property name="sizePolicy">
@@ -34,16 +34,7 @@
<item>
<widget class="QWidget" name="audioZone" native="true">
<layout class="QVBoxLayout" name="audioZoneLayout">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -64,16 +55,7 @@
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -163,22 +145,42 @@
<property name="bottomMargin">
<number>4</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="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -210,33 +212,17 @@
</layout>
</widget>
</item>
- <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>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="spdifBox">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="text">
+ <string>Use S/PDIF when available</string>
+ </property>
</widget>
</item>
</layout>
@@ -465,16 +451,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_1">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item row="0" column="1">
@@ -564,6 +541,7 @@
<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