Qt4 - and fix the previous [22886]

[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 977c706313ba3f68b04f6ded804ce52d8c332e95..affc333b3dc7061e653a94d1f52242789aabf47a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -24,25 +24,26 @@
 #ifndef _SIMPLEPREFS_H_
 #define _SIMPLEPREFS_H_
 
-#include <QListWidget>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
+#include <QWidget>
 
 enum {
-    SPrefsVideo = 0,
+    SPrefsInterface = 0,
     SPrefsAudio,
-    SPrefsInputAndCodecs,
-//    SPrefsPlaylist,
-    SPrefsInterface,
+    SPrefsVideo,
     SPrefsSubtitles,
+    SPrefsInputAndCodecs,
     SPrefsHotkeys,
     SPrefsMax
 };
 #define SPrefsDefaultCat SPrefsInterface
 
 class ConfigControl;
+class QComboBox;
+class QLineEdit;
 
-class SPrefsCatList : public QListWidget
+class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
 public:
@@ -50,6 +51,10 @@ public:
     virtual ~SPrefsCatList() {};
 private:
     intf_thread_t *p_intf;
+signals:
+    void currentItemChanged( int );
+public slots:
+    void switchPanel( int );
 };
 
 class SPrefsPanel : public QWidget
@@ -63,6 +68,18 @@ public:
 private:
     intf_thread_t *p_intf;
     QList<ConfigControl *> controls;
+
+    QWidget *alsa_options;
+    QWidget *oss_options;
+    QWidget *directx_options;
+    QWidget *file_options;
+    QComboBox *audioOutput;
+    QLineEdit *inputDevice;
+
+/* Display only the options for the selected audio output */
+private slots:
+    void lastfm_Changed( int );
+    void updateAudioOptions( int );
 };
 
 #endif