vlc/vlc-3.0 | branch: master | Pierre Lamot <[email protected]> | Wed Dec 20 17:58:05 2017 +0100| [2033d3f76ca975940653fb4616b5d82127db605b] | committer: Hugo Beauzée-Luyssen
Qt: spref, remove Dolby Surround and headphone preference Ref #19305 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit df0634dca2039ab8f4f8ae1a88660a8fec93c080) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2033d3f76ca975940653fb4616b5d82127db605b --- modules/gui/qt/components/simple_preferences.cpp | 14 ------ modules/gui/qt/ui/sprefs_audio.ui | 64 ++---------------------- 2 files changed, 4 insertions(+), 74 deletions(-) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 026ee36479..0e40eff9d6 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -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 */ diff --git a/modules/gui/qt/ui/sprefs_audio.ui b/modules/gui/qt/ui/sprefs_audio.ui index 4bd15613ba..6b783cdf30 100644 --- a/modules/gui/qt/ui/sprefs_audio.ui +++ b/modules/gui/qt/ui/sprefs_audio.ui @@ -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> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
