Qt4 - Fix art display in the bgWidget, fix one volume bug, fix fullscreen button

[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 0a7e78173a9c5ed494e64396b2ac5670ebc5f76c..f81197bd18efb5a828190d5867e59e2b21a0bf4c 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -26,11 +26,17 @@
 #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 "input_manager.hpp"
 
 #include <QWidget>
 #include <QFrame>
@@ -46,6 +52,8 @@ class QHBoxLayout;
 class VideoWidget : public QFrame
 {
     Q_OBJECT
+friend class MainInterface;
+
 public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
@@ -55,11 +63,13 @@ public:
     void  release( void * );
     int   control( void *, int, va_list );
 
+    virtual QSize sizeHint() const;
 private:
     intf_thread_t *p_intf;
     vout_thread_t *p_vout;
 
     vlc_mutex_t lock;
+    QSize videoSize;
 
 signals:
     void askVideoWidgetToShow();
@@ -82,10 +92,10 @@ private:
     QLabel *label;
     virtual void contextMenuEvent( QContextMenuEvent *event );
     intf_thread_t *p_intf;
-
+    virtual void resizeEvent( QResizeEvent * event );
 public slots:
     void toggle(){ TOGGLEV( this ); }
-    void update( input_thread_t * );
+    void updateArt( QString );
 };
 
 class VisualSelector : public QFrame
@@ -123,7 +133,9 @@ private:
 
 private slots:
     void snapshot();
+#if 0
     void frame();
+#endif
     void fromAtoB();
     void record();
     void AtoBLoop( float, int, int );
@@ -152,7 +164,6 @@ public:
     void enableVideo( bool );
 public slots:
     void setNavigation( int );
-    void updateOnTimer();
 protected:
     friend class MainInterface;
     friend class VolumeClickHandler;
@@ -176,6 +187,8 @@ private slots:
     void prev();
     void next();
     void updateVolume( int );
+    void updateVolume( void );
+    void updateInput();
     void fullscreen();
     void extSettings();
     void faster();
@@ -226,6 +239,21 @@ signals:
     void timeLabelDoubleClicked();
 };
 
+class SpeedLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    SpeedLabel( intf_thread_t *_p_intf, const QString text ): QLabel( text)
+    { p_intf = _p_intf; }
+
+protected:
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event )
+    {
+        THEMIM->getIM()->setRate( INPUT_RATE_DEFAULT );
+    }
+private:
+    intf_thread_t *p_intf;
+};
 
 /******************** Speed Control Widgets ****************/
 class SpeedControlWidget : public QFrame
@@ -238,6 +266,8 @@ public:
 private:
     intf_thread_t *p_intf;
     QSlider *speedSlider;
+public slots:
+    void setEnable( bool );
 private slots:
     void updateRate( int );
     void resetRate();