Revert "FSC memory leaks"

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

diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index 38bb76f386a7ca235bedf0964f39fe0129d5eae1..9beac6f8e06398c9b191221a97d66de89360574d 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -31,6 +31,7 @@
 #include "qt4.hpp"
 
 #include <QWidget>
+#include <QFrame>
 #include <QToolButton>
 
 #define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
@@ -61,52 +62,28 @@ private slots:
     void setIcons( bool, bool );
 };
 
-class TeletextController : public QWidget
-{
-    Q_OBJECT
-    friend class AbstractController;
-private:
-    QToolButton         *telexTransparent, *telexOn;
-    QSpinBox            *telexPage;
-
-private slots:
-    void enableTeletextButtons( bool );
-    void toggleTeletextTransparency( bool );
-};
-
 #define VOLUME_MAX 200
 class VolumeClickHandler;
 
 class SoundWidget : public QWidget
 {
     Q_OBJECT
-    friend class VolumeClickHandler;
 
 public:
-    SoundWidget( QWidget *parent, intf_thread_t  *_p_i, bool );
+    SoundWidget( QWidget *parent, intf_thread_t  *_p_i, bool,
+                 bool b_special = false );
 
 private:
     intf_thread_t       *p_intf;
     QLabel              *volMuteLabel;
     QAbstractSlider     *volumeSlider;
-    VolumeClickHandler  *hVolLabel;
     bool                 b_my_volume;
-
+    QMenu               *volumeMenu;
+    virtual bool eventFilter( QObject *obj, QEvent *e );
 protected slots:
     void updateVolume( int );
     void updateVolume( void );
-};
-
-class VolumeClickHandler : public QObject
-{
-public:
-    VolumeClickHandler( intf_thread_t *_p_intf, SoundWidget *_m ) : QObject(_m)
-    {m = _m; p_intf = _p_intf; }
-    virtual ~VolumeClickHandler() {};
-    virtual bool eventFilter( QObject *obj, QEvent *e );
-private:
-    SoundWidget *m;
-    intf_thread_t *p_intf;
+    void showVolumeMenu( QPoint pos );
 };
 
 #endif