Fix memleaks: Fill in the destructor of simple preference.

[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 1a7242c74dcd57fe5acc719dadb570169a542540..afff9f4bee3ef54269f181c6b6ce21b1573227d5 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -2,7 +2,7 @@
  * simple_preferences.hpp : Simple prefs
  ****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: preferences.hpp 16348 2006-08-25 21:10:10Z zorglub $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -24,10 +24,23 @@
 #ifndef _SIMPLEPREFS_H_
 #define _SIMPLEPREFS_H_
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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"
+#endif
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,
@@ -39,6 +52,29 @@ enum {
 };
 #define SPrefsDefaultCat SPrefsInterface
 
+enum {
+    CachingCustom = 0,
+    CachingLowest = 100,
+    CachingLow = 200,
+    CachingNormal = 300,
+    CachingHigh = 400,
+    CachingHigher = 500
+};
+
+enum {
+#ifdef WIN32
+       directxW,
+#else
+       alsaW,
+       ossW,
+#endif
+       fileW,
+       audioOutCoB,
+       normalizerChB,
+       volLW };
+enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
+enum { skinRB, qtRB };
+
 class ConfigControl;
 class QComboBox;
 class QLineEdit;
@@ -46,6 +82,10 @@ class QRadioButton;
 class QCheckBox;
 class QString;
 
+#ifdef WIN32
+class QTreeWidgetItem;
+#endif
+
 class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
@@ -65,7 +105,7 @@ class SPrefsPanel : public QWidget
     Q_OBJECT
 public:
     SPrefsPanel( intf_thread_t *, QWidget *, int );
-    virtual ~SPrefsPanel() {};
+    virtual ~SPrefsPanel();
     void apply();
     void clean();
 private:
@@ -74,22 +114,23 @@ private:
 
     int number;
 
-    /* this is ugly and bad until I found a new solution */
-    QWidget *alsa_options;
-    QWidget *oss_options;
-    QWidget *directx_options;
-    QWidget *file_options;
-    QComboBox *audioOutput;
-    QLineEdit *inputDevice;
-    QRadioButton *skinInterfaceButton;
-    QRadioButton *qtInterfaceButton;
+    QList<QWidget *> optionWidgets;
     QString qs_filter;
-    QCheckBox *normalizerBox;
+
+#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 updateAudioVolume( int );
+#ifdef SYS_MINGW32
+    void assoDialog();
+    void saveAsso();
+#endif
 };
 
 #endif