Qt: emit video window resize events

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 8c7177ff92946cfefed439de2e6b766011e258c3..602602ef81a6a5c1e0faf97a5236ef6458499f77 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -35,8 +35,6 @@
 
 #include "menus.hpp"             /* Popup menu on bgWidget */
 
-#include <vlc_vout.h>
-
 #include <QLabel>
 #include <QToolButton>
 #include <QPalette>
@@ -64,6 +62,9 @@
 #include <math.h>
 #include <assert.h>
 
+#include <vlc_vout.h>
+#include <vlc_vout_window.h>
+
 /**********************************************************************
  * Video Widget. A simple frame on which video is drawn
  * This class handles resize issues
@@ -78,6 +79,7 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i )
     layout = new QHBoxLayout( this );
     layout->setContentsMargins( 0, 0, 0, 0 );
     stable = NULL;
+    p_window = NULL;
     show();
 }
 
@@ -85,6 +87,7 @@ VideoWidget::~VideoWidget()
 {
     /* Ensure we are not leaking the video output. This would crash. */
     assert( !stable );
+    assert( !p_window );
 }
 
 void VideoWidget::sync( void )
@@ -100,14 +103,16 @@ void VideoWidget::sync( void )
 /**
  * Request the video to avoid the conflicts
  **/
-WId VideoWidget::request( unsigned int *pi_width, unsigned int *pi_height,
-                          bool b_keep_size )
+WId VideoWidget::request( struct vout_window_t *p_wnd, unsigned int *pi_width,
+                          unsigned int *pi_height, bool b_keep_size )
 {
     if( stable )
     {
         msg_Dbg( p_intf, "embedded video already in use" );
         return 0;
     }
+    assert( !p_window );
+
     if( b_keep_size )
     {
         *pi_width  = size().width();
@@ -148,6 +153,7 @@ WId VideoWidget::request( unsigned int *pi_width, unsigned int *pi_height,
     XSelectInput( dpy, w, attr.your_event_mask );
 #endif
     sync();
+    p_window = p_wnd;
     return stable->winId();
 }
 
@@ -168,6 +174,15 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
     sync();
 }
 
+void VideoWidget::resizeEvent( QResizeEvent *event )
+{
+    if( p_window != NULL )
+        vout_window_ReportSize( p_window, event->size().width(),
+                                event->size().height() );
+
+    QWidget::resizeEvent( event );
+}
+
 void VideoWidget::release( void )
 {
     msg_Dbg( p_intf, "Video is not needed anymore" );
@@ -177,6 +192,7 @@ void VideoWidget::release( void )
         layout->removeWidget( stable );
         stable->deleteLater();
         stable = NULL;
+        p_window = NULL;
     }
 
     updateGeometry();

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 1ee86eb71d3373983e778970686e85a6497e1aea..16138da0d42eee7148afd8551b71515542868f05 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -50,6 +50,7 @@ class QPixmap;
 class QHBoxLayout;
 class QMenu;
 class QSlider;
+struct vout_window_t;
 
 /******************** Video Widget ****************/
 class VideoWidget : public QFrame
@@ -59,7 +60,7 @@ public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
 
-    WId request( unsigned int *, unsigned int *, bool );
+    WId request( struct vout_window_t *, unsigned int *, unsigned int *, bool );
     void  release( void );
     void  sync( void );
 
@@ -69,8 +70,11 @@ protected:
         return NULL;
     }
 
+    virtual void resizeEvent(QResizeEvent *);
+
 private:
     intf_thread_t *p_intf;
+    vout_window_t *p_window;
 
     QWidget *stable;
     QLayout *layout;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index d99d3b73eaf6cc283f36030640b5f26e0b51775d..35d14697a6d83ff2d48bb5999a10fdd5b9bf35b7 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -203,8 +203,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 
     /* VideoWidget connects for asynchronous calls */
     b_videoFullScreen = false;
-    connect( this, SIGNAL(askGetVideo(WId*,unsigned*,unsigned *)),
-             this, SLOT(getVideoSlot(WId*,unsigned*,unsigned*)),
+    connect( this, SIGNAL(askGetVideo(WId*,struct vout_window_t*,unsigned*,unsigned *)),
+             this, SLOT(getVideoSlot(WId*,struct vout_window_t*,unsigned*,unsigned*)),
              Qt::BlockingQueuedConnection );
     connect( this, SIGNAL(askReleaseVideo( void )),
              this, SLOT(releaseVideoSlot( void )),
@@ -681,7 +681,8 @@ void MainInterface::toggleFSC()
  * All window provider queries must be handled through signals or events.
  * That's why we have all those emit statements...
  */
-WId MainInterface::getVideo( unsigned int *pi_width, unsigned int *pi_height )
+WId MainInterface::getVideo( struct vout_window_t *p_wnd,
+                             unsigned int *pi_width, unsigned int *pi_height )
 {
     if( !videoWidget )
         return 0;
@@ -689,11 +690,11 @@ WId MainInterface::getVideo( unsigned int *pi_width, unsigned int *pi_height )
     /* This is a blocking call signal. Results are returned through pointers.
      * Beware of deadlocks! */
     WId id;
-    emit askGetVideo( &id, pi_width, pi_height );
+    emit askGetVideo( &id, p_wnd, pi_width, pi_height );
     return id;
 }
 
-void MainInterface::getVideoSlot( WId *p_id,
+void MainInterface::getVideoSlot( WId *p_id, struct vout_window_t *p_wnd,
                                   unsigned *pi_width, unsigned *pi_height )
 {
     /* Hidden or minimized, activate */
@@ -701,7 +702,7 @@ void MainInterface::getVideoSlot( WId *p_id,
         toggleUpdateSystrayMenu();
 
     /* Request the videoWidget */
-    WId ret = videoWidget->request( pi_width, pi_height, !b_autoresize );
+    WId ret = videoWidget->request( p_wnd, pi_width, pi_height, !b_autoresize );
     *p_id = ret;
     if( ret ) /* The videoWidget is available */
     {

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 34ca4af4001f8998dc92081e64526ef1602d8b2f..ab4fca25a260d43294a5b30d1c1651417133ad62 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -55,6 +55,7 @@ class QVBoxLayout;
 class QMenu;
 class QSize;
 class StandardPLPanel;
+struct vout_window_t;
 
 class MainInterface : public QVLCMW
 {
@@ -70,7 +71,8 @@ public:
     static const QEvent::Type ToolbarsNeedRebuild;
 
     /* Video requests from core */
-    WId  getVideo( unsigned int *pi_width, unsigned int *pi_height );
+    WId  getVideo( struct vout_window_t *,
+                   unsigned int *pi_width, unsigned int *pi_height );
     void releaseVideo( void );
     int  controlVideo( int i_query, va_list args );
 
@@ -208,7 +210,8 @@ public slots:
 #endif
 
     /* Manage the Video Functions from the vout threads */
-    void getVideoSlot( WId *p_id, unsigned *pi_width, unsigned *pi_height );
+    void getVideoSlot( WId *p_id, struct vout_window_t *,
+                       unsigned *pi_width, unsigned *pi_height );
     void releaseVideoSlot( void );
 
     void emitBoss();
@@ -259,7 +262,7 @@ private slots:
     void continuePlayback();
 
 signals:
-    void askGetVideo( WId *p_id, unsigned *pi_width, unsigned *pi_height );
+    void askGetVideo( WId *, struct vout_window_t *, unsigned *, unsigned * );
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 9f63031dd0cbb45d9949263485070fb6b2de7c05..1e25371b0661da4e74d25c609ed437b5e3a90409 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -672,7 +672,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
     unsigned i_width = cfg->width;
     unsigned i_height = cfg->height;
 
-    WId wid = p_mi->getVideo( &i_width, &i_height );
+    WId wid = p_mi->getVideo( p_wnd, &i_width, &i_height );
     if( !wid )
         return VLC_EGENERIC;