Qt4 - Include fix

[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 70a90a1d1edaa3477ae6d3cdeeedcf43a18d1c8e..ce8e31d962c5ac7ec4afbd1318e9f5142cc2efce 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -26,11 +26,16 @@
 #ifndef _INTFWIDGETS_H_
 #define _INTFWIDGETS_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-
 #include <vlc_aout.h>
+
 #include "qt4.hpp"
+#include "main_interface.hpp"
 
 #include <QWidget>
 #include <QFrame>
@@ -46,49 +51,50 @@ class QHBoxLayout;
 class VideoWidget : public QFrame
 {
     Q_OBJECT
+friend class MainInterface;
+
 public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
 
     void *request( vout_thread_t *, int *, int *,
                    unsigned int *, unsigned int * );
-    void release( void * );
-    int control( void *, int, va_list );
-
-    int i_video_height, i_video_width;
-    vout_thread_t *p_vout;
+    void  release( void * );
+    int   control( void *, int, va_list );
 
-    QSize widgetSize;
-    QSize sizeHint() const;
+    virtual QSize sizeHint() const;
 private:
-    QWidget *frame;
     intf_thread_t *p_intf;
+    vout_thread_t *p_vout;
+
     vlc_mutex_t lock;
+    QSize videoSize;
+
 signals:
-    void askResize();
-    void askVideoToShow();
-private slots:
-    void SetMinSize();
+    void askVideoWidgetToShow();
+    //void askResize();
+
+public slots:
+    void SetSizing( unsigned int, unsigned int );
 };
 
 /******************** Background Widget ****************/
-class BackgroundWidget : public QFrame
+class BackgroundWidget : public QWidget
 {
     Q_OBJECT
 public:
     BackgroundWidget( intf_thread_t * );
     virtual ~BackgroundWidget();
-    QSize widgetSize;
-    QSize sizeHint() const;
+
 private:
     QPalette plt;
     QLabel *label;
-    virtual void resizeEvent( QResizeEvent *e );
     virtual void contextMenuEvent( QContextMenuEvent *event );
     intf_thread_t *p_intf;
+
 public slots:
-    void setArt( QString );
     void toggle(){ TOGGLEV( this ); }
+    void update( QString );
 };
 
 class VisualSelector : public QFrame
@@ -126,7 +132,9 @@ private:
 
 private slots:
     void snapshot();
+#if 0
     void frame();
+#endif
     void fromAtoB();
     void record();
     void AtoBLoop( float, int, int );
@@ -139,6 +147,7 @@ class QGridLayout;
 class VolumeClickHandler;
 class SoundSlider;
 class QAbstractSlider;
+class QToolButton;
 
 class ControlsWidget : public QFrame
 {
@@ -146,7 +155,6 @@ class ControlsWidget : public QFrame
 public:
     /* p_intf, advanced control visible or not, blingbling or not */
     ControlsWidget( intf_thread_t *, MainInterface*, bool, bool );
-//    QSize sizeHint() const;
     virtual ~ControlsWidget();
 
     QPushButton *playlistButton;
@@ -155,18 +163,18 @@ public:
     void enableVideo( bool );
 public slots:
     void setNavigation( int );
-    void updateOnTimer();
 protected:
     friend class MainInterface;
     friend class VolumeClickHandler;
 private:
     intf_thread_t       *p_intf;
-    QFrame              *discFrame;
+    QWidget             *discFrame;
+    QWidget             *telexFrame;
     QGridLayout         *controlLayout;
     InputSlider         *slider;
     QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
     QPushButton         *playButton, *fullscreenButton;
-    QPushButton         *slowerButton, *fasterButton;
+    QToolButton         *slowerButton, *fasterButton;
     AdvControlsWidget   *advControls;
     QLabel              *volMuteLabel;
     QAbstractSlider     *volumeSlider;
@@ -178,6 +186,8 @@ private slots:
     void prev();
     void next();
     void updateVolume( int );
+    void updateVolume( void );
+    void updateInput();
     void fullscreen();
     void extSettings();
     void faster();
@@ -229,39 +239,6 @@ signals:
 };
 
 
-/******************** Playlist Widgets ****************/
-#include <QModelIndex>
-#include <QSplitter>
-class QSignalMapper;
-class PLSelector;
-class PLPanel;
-class QPushButton;
-class QSettings;
-
-class PlaylistWidget : public QSplitter
-{
-    Q_OBJECT;
-public:
-    PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) ;
-    virtual ~PlaylistWidget();
-    QSize sizeHint() const;
-    void savingSettings( QSettings *settings );
-private:
-    PLSelector *selector;
-    PLPanel *rightPanel;
-    QPushButton *addButton;
-    QLabel *art;
-    QString prevArt;
-protected:
-    intf_thread_t *p_intf;
-private slots:
-    void setArt( QString );
-signals:
-    void rootChanged( int );
-    void artSet( QString );
-};
-
-
 /******************** Speed Control Widgets ****************/
 class SpeedControlWidget : public QFrame
 {
@@ -270,10 +247,11 @@ public:
     SpeedControlWidget( intf_thread_t *);
     virtual ~SpeedControlWidget();
     void updateControls( int );
+protected:
+    virtual void mouseDoubleClickEvent( QMouseEvent * event );
 private:
     intf_thread_t *p_intf;
     QSlider *speedSlider;
-    QPushButton *normalSpeedButton;
 private slots:
     void updateRate( int );
     void resetRate();