Skip to content

V
vlc-2-2
Commit 607c5b7a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Revert "Qt: remove SPDIF option" 

This reverts commit d39285a1.

Conflicts:
	modules/gui/qt4/components/simple_preferences.cpp
parent 0206828a
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 63 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ 607c5b7a
...@@ -515,6 +515,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -515,6 +515,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "audio-language" , String , ui.langLabel, CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage ); preferredAudioLanguage );
CONFIG_BOOL( "spdif", spdifBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel, CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby ); detectionDolby );
...@@ -543,6 +544,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -543,6 +544,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets["volLW"] = ui.volumeValue; optionWidgets["volLW"] = ui.volumeValue;
optionWidgets["headphoneB"] = ui.headphoneEffect; optionWidgets["headphoneB"] = ui.headphoneEffect;
optionWidgets["spdifChB"] = ui.spdifBox;
optionWidgets["defaultVolume"] = ui.defaultVolume; optionWidgets["defaultVolume"] = ui.defaultVolume;
optionWidgets["resetVolumeCheckbox"] = ui.resetVolumeCheckbox; optionWidgets["resetVolumeCheckbox"] = ui.resetVolumeCheckbox;
updateAudioOptions( ui.outputModule->currentIndex() ); updateAudioOptions( ui.outputModule->currentIndex() );
...@@ -968,6 +970,8 @@ void SPrefsPanel::updateAudioOptions( int number) ...@@ -968,6 +970,8 @@ void SPrefsPanel::updateAudioOptions( int number)
} }
#endif #endif
optionWidgets["fileW"]->setVisible( ( value == "afile" ) ); optionWidgets["fileW"]->setVisible( ( value == "afile" ) );
optionWidgets["spdifChB"]->setVisible( ( value == "alsa" || value == "oss" || value == "auhal" ||
value == "directsound" || value == "waveout" ) );
} }
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 607c5b7a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>707</width> <width>707</width>
<height>544</height> <height>509</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -34,16 +34,7 @@ ...@@ -34,16 +34,7 @@
<item> <item>
<widget class="QWidget" name="audioZone" native="true"> <widget class="QWidget" name="audioZone" native="true">
<layout class="QVBoxLayout" name="audioZoneLayout"> <layout class="QVBoxLayout" name="audioZoneLayout">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -64,16 +55,7 @@ ...@@ -64,16 +55,7 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -163,22 +145,42 @@ ...@@ -163,22 +145,42 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>4</number>
</property> </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"> <item row="1" column="0" colspan="2">
<widget class="QWidget" name="fileControl" native="true"> <widget class="QWidget" name="fileControl" native="true">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -210,33 +212,17 @@ ...@@ -210,33 +212,17 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="3" column="1">
<widget class="QLabel" name="outputLabel"> <widget class="QCheckBox" name="spdifBox">
<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"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text">
<string>Use S/PDIF when available</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -465,16 +451,7 @@ ...@@ -465,16 +451,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_1"> <layout class="QGridLayout" name="gridLayout_1">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
...@@ -564,6 +541,7 @@ ...@@ -564,6 +541,7 @@
<tabstop>outputModule</tabstop> <tabstop>outputModule</tabstop>
<tabstop>fileName</tabstop> <tabstop>fileName</tabstop>
<tabstop>fileBrowseButton</tabstop> <tabstop>fileBrowseButton</tabstop>
<tabstop>spdifBox</tabstop>
<tabstop>autoscaleBox</tabstop> <tabstop>autoscaleBox</tabstop>
<tabstop>volNormBox</tabstop> <tabstop>volNormBox</tabstop>
<tabstop>volNormSpin</tabstop> <tabstop>volNormSpin</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