[vlc-commits] Qt: correctly display waveout options

Jean-Baptiste Kempf git at videolan.org
Sun Sep 8 18:47:52 CEST 2013


vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep  8 18:39:29 2013 +0200| [9bc4d99edbc2e023a1b4b8688b485663a1787a4f] | committer: Jean-Baptiste Kempf

Qt: correctly display waveout options

(cherry picked from commit 3d14918f81dd3216242ca0dba8857860274e066c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=9bc4d99edbc2e023a1b4b8688b485663a1787a4f
---

 modules/gui/qt4/components/simple_preferences.cpp |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index b33140a..e07d631 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -427,6 +427,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets["directxW" ] = DirectXDevice;
             CONFIG_GENERIC_NO_UI( "directx-audio-device", StringList,
                     DirectXLabel, DirectXDevice );
+
+            audioControl( Waveout );
+            optionWidgets["waveoutL" ] = WaveoutLabel;
+            optionWidgets["waveoutW" ] = WaveoutDevice;
+            CONFIG_GENERIC_NO_UI( "waveout-audio-device", StringList,
+                    WaveoutLabel, WaveoutDevice );
+
 #elif defined( __OS2__ )
             audioControl( kai );
             optionWidgets["kaiL"] = kaiLabel;
@@ -940,6 +947,8 @@ void SPrefsPanel::updateAudioOptions( int number)
 #ifdef _WIN32
     optionWidgets["directxW"]->setVisible( ( value == "directsound" ) );
     optionWidgets["directxL"]->setVisible( ( value == "directsound" ) );
+    optionWidgets["waveoutW"]->setVisible( ( value == "waveout" ) );
+    optionWidgets["waveoutL"]->setVisible( ( value == "waveout" ) );
 #elif defined( __OS2__ )
     optionWidgets["kaiL"]->setVisible( ( value == "kai" ) );
     optionWidgets["kaiW"]->setVisible( ( value == "kai" ) );



More information about the vlc-commits mailing list