X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.hpp;h=68c0ac25557b82d91b669a7cf9aecde7614a669a;hb=499342e1842c1d79a029256695672833baf10c4b;hp=08a8b1f6263dd2b0ae6c81fce8ae680dc614b374;hpb=3500cf1011e97ae7c60b63b4147cbcb69bde5d47;p=vlc

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 08a8b1f626..68c0ac2555 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -24,10 +24,23 @@
 #ifndef _SIMPLEPREFS_H_
 #define _SIMPLEPREFS_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.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"
+#endif
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,
@@ -39,8 +52,30 @@ enum {
 };
 #define SPrefsDefaultCat SPrefsInterface
 
+enum {
+    CachingCustom = 0,
+    CachingLowest = 100,
+    CachingLow = 200,
+    CachingNormal = 300,
+    CachingHigh = 400,
+    CachingHigher = 500
+};
+
+enum { alsaW = 0, ossW, directxW, fileW, audioOutCoB, normalizerChB };
+enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
+enum { skinRB, qtRB };
+
 class ConfigControl;
 class QComboBox;
+class QLineEdit;
+class QRadioButton;
+class QCheckBox;
+class QString;
+
+#ifdef WIN32
+class QTreeWidgetItem;
+#endif
+
 class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
@@ -67,16 +102,24 @@ private:
     intf_thread_t *p_intf;
     QList<ConfigControl *> controls;
 
-    QWidget *alsa_options;
-    QWidget *oss_options;
-    QWidget *directx_options;
-    QWidget *file_options;
-    QComboBox *audioOutput;
+    int number;
+
+    QList<QWidget *> optionWidgets;
+    QString qs_filter;
+
+#ifdef WIN32
+    QList<QTreeWidgetItem *> listAsso;
+    bool addType( const char * psz_ext, QTreeWidgetItem*, QTreeWidgetItem*, QVLCRegistry* );
+#endif
 
 /* Display only the options for the selected audio output */
 private slots:
     void lastfm_Changed( int );
-    void updateAudioOptions( int );
+    void updateAudioOptions( int ); 
+#ifdef SYS_MINGW32
+    void assoDialog();
+    void saveAsso();
+#endif
 };
 
 #endif