Qt4 - Simple prefs, re-do [22621], but removes all the connects for all the configcon...

[vlc] / modules / gui / qt4 / components / simple_preferences.hpp

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index bc739e25d91c822a78c278dbe0f97a23ee002be7..08a8b1f6263dd2b0ae6c81fce8ae680dc614b374 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -26,7 +26,6 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-
 #include <QWidget>
 
 enum {
@@ -41,7 +40,7 @@ enum {
 #define SPrefsDefaultCat SPrefsInterface
 
 class ConfigControl;
-
+class QComboBox;
 class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
@@ -68,21 +67,16 @@ private:
     intf_thread_t *p_intf;
     QList<ConfigControl *> controls;
 
-/* ConfigControl for audio output options */
-#ifndef WIN32
-    ConfigControl *alsa_options;
-    ConfigControl *oss_options;
-#else
-    ConfigControl *directx_options;
-#endif
-    ConfigControl *file_options;
-
-    void updateAudioOptions( QString );
+    QWidget *alsa_options;
+    QWidget *oss_options;
+    QWidget *directx_options;
+    QWidget *file_options;
+    QComboBox *audioOutput;
 
 /* Display only the options for the selected audio output */
 private slots:
-    void AudioDeviceChanged();
     void lastfm_Changed( int );
+    void updateAudioOptions( int );
 };
 
 #endif