Qt: extended panels, code simplification and spatializer slider naming

[vlc] / modules / gui / qt4 / components / extended_panels.hpp

diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index 8951ab66c58cc1e1e0353f3391970edcac66a353..c7b751d1f592a54424f45d76956f19f2c7e178af 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -30,16 +30,15 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_aout.h>
 
 #include "ui/equalizer.h"
 #include "ui/video_effects.h"
 #include "ui/v4l2.h"
-#include "../../audio_filter/equalizer_presets.h"
 
 #include <QTabWidget>
 
-#define BANDS EQZ_BANDS_MAX
+#define BANDS 10
+#define NUM_CP_CTRL 7
 #define NUM_SP_CTRL 5
 
 class QSignalMapper;
@@ -49,7 +48,7 @@ class ExtVideo: public QObject
     Q_OBJECT
     friend class ExtendedDialog;
 public:
-    ExtVideo( intf_thread_t *, QTabWidget * );
+    ExtVideo( struct intf_thread_t *, QTabWidget * );
     virtual ~ExtVideo();
     /*void gotoConf( QObject* );*/
 private:
@@ -93,7 +92,6 @@ class Equalizer: public QWidget
     friend class ExtendedDialog;
 public:
     Equalizer( intf_thread_t *, QWidget * );
-    virtual ~Equalizer();
     QComboBox *presetsComboBox;
 
     char * createValuesFromPreset( int i_preset );
@@ -107,7 +105,7 @@ private:
     void addCallbacks( aout_instance_t * );
 
     intf_thread_t *p_intf;
-    void clean();
+    void clean() { enable(); }
 private slots:
     void enable(bool);
     void enable();
@@ -115,7 +113,35 @@ private slots:
     void setPreamp();
     void setCoreBands();
     void setCorePreset(int);
-    void updateUISliderValues( int );
+};
+
+class Compressor: public QWidget
+{
+    Q_OBJECT
+public:
+    Compressor( intf_thread_t *, QWidget * );
+
+private:
+    QSlider *compCtrl[NUM_CP_CTRL];
+    QLabel *ctrl_texts[NUM_CP_CTRL];
+    QLabel *ctrl_readout[NUM_CP_CTRL];
+    float controlVars[NUM_CP_CTRL];
+    float oldControlVars[NUM_CP_CTRL];
+
+    QCheckBox *enableCheck;
+
+    intf_thread_t *p_intf;
+
+    void delCallbacks( aout_instance_t * );
+    void addCallbacks( aout_instance_t * );
+
+    void updateSliders(float *);
+    void setValues(float *);
+
+private slots:
+    void enable(bool);
+    void enable();
+    void setInitValues();
 };
 
 class Spatializer: public QWidget
@@ -123,7 +149,6 @@ class Spatializer: public QWidget
     Q_OBJECT
 public:
     Spatializer( intf_thread_t *, QWidget * );
-    virtual ~Spatializer();
 
 private:
     QSlider *spatCtrl[NUM_SP_CTRL];
@@ -137,10 +162,12 @@ private:
     void delCallbacks( aout_instance_t * );
     void addCallbacks( aout_instance_t * );
     intf_thread_t *p_intf;
+
+    void setValues(float *);
+
 private slots:
     void enable(bool);
     void enable();
-    void setValues(float *);
     void setInitValues();
 };