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 7403cbdbf7783e4560b2cac88dd938a61e09c37c..affc333b3dc7061e653a94d1f52242789aabf47a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -24,36 +24,37 @@
 #ifndef _SIMPLEPREFS_H_
 #define _SIMPLEPREFS_H_
 
-#include <QListWidget>
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
+#include <QWidget>
 
 enum {
-    SPrefsVideo,
+    SPrefsInterface = 0,
     SPrefsAudio,
-    SPrefsInputAndCodecs,
-    SPrefsPlaylist,
-    SPrefsInterface,
+    SPrefsVideo,
     SPrefsSubtitles,
-    SPrefsAdvanced
+    SPrefsInputAndCodecs,
+    SPrefsHotkeys,
+    SPrefsMax
 };
 #define SPrefsDefaultCat SPrefsInterface
 
 class ConfigControl;
+class QComboBox;
+class QLineEdit;
 
-class SPrefsCatList : public QListWidget
+class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
 public:
     SPrefsCatList( intf_thread_t *, QWidget *);
     virtual ~SPrefsCatList() {};
-
-    void ApplyAll();
-    void CleanAll();
-
 private:
-    void DoAll( bool );
     intf_thread_t *p_intf;
+signals:
+    void currentItemChanged( int );
+public slots:
+    void switchPanel( int );
 };
 
 class SPrefsPanel : public QWidget
@@ -62,11 +63,23 @@ class SPrefsPanel : public QWidget
 public:
     SPrefsPanel( intf_thread_t *, QWidget *, int );
     virtual ~SPrefsPanel() {};
-    void Apply();
-    void Clean();
+    void apply();
+    void clean();
 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