Qt: extended panels, remove last tab and simplify code

[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 5568ea71b5f4971b6fe1c07c542934efe920dd96..89721a47bba718f90717835c6d5e15c04d0e303d 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -30,7 +30,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_aout.h>
 
 #include "ui/equalizer.h"
 #include "ui/video_effects.h"
@@ -39,6 +38,7 @@
 #include <QTabWidget>
 
 #define BANDS 10
+#define NUM_CP_CTRL 7
 #define NUM_SP_CTRL 5
 
 class QSignalMapper;
@@ -49,7 +49,6 @@ class ExtVideo: public QObject
     friend class ExtendedDialog;
 public:
     ExtVideo( struct intf_thread_t *, QTabWidget * );
-    virtual ~ExtVideo();
     /*void gotoConf( QObject* );*/
 private:
     Ui::ExtVideoWidget ui;
@@ -71,7 +70,6 @@ class ExtV4l2 : public QWidget
     Q_OBJECT
 public:
     ExtV4l2( intf_thread_t *, QWidget * );
-    virtual ~ExtV4l2();
 
     virtual void showEvent( QShowEvent *event );
 
@@ -92,7 +90,6 @@ class Equalizer: public QWidget
     friend class ExtendedDialog;
 public:
     Equalizer( intf_thread_t *, QWidget * );
-    virtual ~Equalizer();
     QComboBox *presetsComboBox;
 
     char * createValuesFromPreset( int i_preset );
@@ -106,7 +103,7 @@ private:
     void addCallbacks( aout_instance_t * );
 
     intf_thread_t *p_intf;
-    void clean();
+    void clean() { enable(); }
 private slots:
     void enable(bool);
     void enable();
@@ -114,7 +111,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
@@ -122,7 +147,6 @@ class Spatializer: public QWidget
     Q_OBJECT
 public:
     Spatializer( intf_thread_t *, QWidget * );
-    virtual ~Spatializer();
 
 private:
     QSlider *spatCtrl[NUM_SP_CTRL];
@@ -136,10 +160,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();
 };