X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.hpp;h=e61e06bee009dd492868fc197297ad7a3268ad55;hb=a1c69e8ee4a1e2128006b7b008751cd1609c96d9;hp=acd8763e8156c4f64155fd8b9d04d3a28bc203a4;hpb=c67627c63b23033eccbf1251151b324c6e0d5c62;p=vlc

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index acd8763e81..e61e06bee0 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -28,19 +28,21 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
-#include <QWidget>
 
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_interface.h"
+
 #ifdef WIN32
-#include "util/registry.hpp"
+# include "util/registry.hpp"
 #endif
 
+#include <QWidget>
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,
@@ -55,10 +57,10 @@ enum {
 enum {
     CachingCustom = 0,
     CachingLowest = 100,
-    CachingLow = 200,
+    CachingLow    = 200,
     CachingNormal = 300,
-    CachingHigh = 400,
-    CachingHigher = 500
+    CachingHigh   = 750,
+    CachingHigher = 2500
 };
 
 enum {
@@ -71,9 +73,12 @@ enum {
        fileW,
        audioOutCoB,
        normalizerChB,
-       volLW };
-enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
-enum { skinRB, qtRB };
+       volLW,
+       headphoneB,
+       spdifChB,
+};
+enum { inputLE, cachingCoB };
+enum { skinRB, qtRB, styleCB };
 
 class ConfigControl;
 class QComboBox;
@@ -90,7 +95,7 @@ class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
 public:
-    SPrefsCatList( intf_thread_t *, QWidget *);
+    SPrefsCatList( intf_thread_t *, QWidget *, bool );
     virtual ~SPrefsCatList() {};
 private:
     intf_thread_t *p_intf;
@@ -104,8 +109,8 @@ class SPrefsPanel : public QWidget
 {
     Q_OBJECT
 public:
-    SPrefsPanel( intf_thread_t *, QWidget *, int );
-    virtual ~SPrefsPanel() {};
+    SPrefsPanel( intf_thread_t *, QWidget *, int, bool );
+    virtual ~SPrefsPanel();
     void apply();
     void clean();
 private:
@@ -115,7 +120,7 @@ private:
     int number;
 
     QList<QWidget *> optionWidgets;
-    QString qs_filter;
+    QStringList qs_filter;
 
 #ifdef WIN32
     QList<QTreeWidgetItem *> listAsso;
@@ -131,6 +136,7 @@ private slots:
     void assoDialog();
     void saveAsso();
 #endif
+    void changeStyle( QString );
 };
 
 #endif