Qt4: remove bogus vlc_aout.h dependencies

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

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 206c57913d3197dbe3924033dcc77d396874c70e..f80aab3d837cac026e69d041faec6376e9b3aba7 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -36,8 +36,6 @@
 #include "components/controller.hpp"
 #include "components/controller_widget.hpp"
 
-//#include <vlc_aout.h> Visualizer
-
 #include <QWidget>
 #include <QFrame>
 #include <QLabel>
@@ -48,18 +46,19 @@ class QPalette;
 class QPixmap;
 class QHBoxLayout;
 class QMenu;
+class ReparentableWidget;
 
 /******************** Video Widget ****************/
 class VideoWidget : public QFrame
 {
     Q_OBJECT
-friend class MainInterface;
+friend class ReparentableWidget;
 
 public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
 
-    WId request( vout_thread_t *, int *, int *,
+    WId request( int *, int *,
                  unsigned int *, unsigned int *, bool );
     void  release( void );
     int   control( void *, int, va_list );
@@ -72,20 +71,19 @@ protected:
         return NULL;
     }
 
-    virtual void paintEvent(QPaintEvent *);
-
 private:
     intf_thread_t *p_intf;
-    vout_thread_t *p_vout;
 
     QSize videoSize;
+    QWidget *reparentable;
+    QLayout *layout;
 
 signals:
-    void askVideoWidgetToShow( unsigned int, unsigned int );
+    void keyPressed( QKeyEvent * );
 
 public slots:
     void SetSizing( unsigned int, unsigned int );
-
+    void SetFullScreen( bool );
 };
 
 /******************** Background Widget ****************/
@@ -105,7 +103,7 @@ private:
 
 public slots:
     void toggle(){ TOGGLEV( this ); }
-    void updateArt( QString );
+    void updateArt( const QString& );
 };
 
 #if 0
@@ -160,10 +158,9 @@ public:
     virtual ~SpeedLabel();
 
 protected:
-    virtual void mouseDoubleClickEvent ( QMouseEvent * event )
+    virtual void mousePressEvent ( QMouseEvent * event )
     {
-        event->accept();
-        THEMIM->getIM()->setRate( INPUT_RATE_DEFAULT );
+        showSpeedMenu( event->pos() );
     }
 private slots:
     void showSpeedMenu( QPoint );
@@ -209,10 +206,10 @@ public slots:
     {
         requestUpdate();
     }
+    void showArtUpdate( const QString& );
 
 private slots:
-    void doUpdate();
-    void doUpdate(QString);
+    void askForUpdate();
 
 signals:
     void updateRequested();