[PATCH] Corrects unfortunate cone behavior between two videos=0A=

[Joseph Tulou]

=0A=
---=0A=
 modules/gui/qt4/components/interface_widgets.cpp |    6 ------=0A=
 modules/gui/qt4/main_interface.cpp               |    9 +++++++++=0A=
 modules/gui/qt4/main_interface.hpp               |    1 +=0A=
 3 files changed, 10 insertions(+), 6 deletions(-)=0A=
=0A=
diff --git a/modules/gui/qt4/components/interface_widgets.cpp =
b/modules/gui/qt4/components/interface_widgets.cpp=0A=
index 3f40b2f..e9a26db 100644=0A=
--- a/modules/gui/qt4/components/interface_widgets.cpp=0A=
+++ b/modules/gui/qt4/components/interface_widgets.cpp=0A=
@@ -76,11 +76,6 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : =
QFrame( NULL ), p_intf( _p_i )=0A=
        Widgets with this attribute set do not participate in composition=0A=
        management */=0A=
     setAttribute( Qt::WA_PaintOnScreen, true );=0A=
-=0A=
-    /* The core can ask through a callback to show the video. */=0A=
-    connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned =
int)),=0A=
-             this, SLOT(SetSizing(unsigned int, unsigned int )),=0A=
-             Qt::BlockingQueuedConnection );=0A=
 }=0A=
 =0A=
 void VideoWidget::paintEvent(QPaintEvent *ev)=0A=
@@ -112,7 +107,6 @@ WId VideoWidget::request( vout_thread_t *p_nvout, =
int *pi_x, int *pi_y,=0A=
         *pi_height =3D size().height();=0A=
     }=0A=
 =0A=
-    emit askVideoWidgetToShow( *pi_width, *pi_height );=0A=
     if( p_vout )=0A=
     {=0A=
         msg_Dbg( p_intf, "embedded video already in use" );=0A=
diff --git a/modules/gui/qt4/main_interface.cpp =
b/modules/gui/qt4/main_interface.cpp=0A=
index e7dfb1e..408bce7 100644=0A=
--- a/modules/gui/qt4/main_interface.cpp=0A=
+++ b/modules/gui/qt4/main_interface.cpp=0A=
@@ -212,9 +212,15 @@ MainInterface::MainInterface( intf_thread_t =
*_p_intf ) : QVLCMW( _p_intf )=0A=
              this, SLOT(releaseVideoSlot( void )), =
Qt::BlockingQueuedConnection );=0A=
 =0A=
     if( videoWidget )=0A=
+    {=0A=
         CONNECT( this, askVideoToResize( unsigned int, unsigned int ),=0A=
                  videoWidget, SetSizing( unsigned int, unsigned int ) );=0A=
 =0A=
+        connect( this, SIGNAL(askVideoToShow( unsigned int, unsigned =
int)),=0A=
+             videoWidget, SLOT(SetSizing(unsigned int, unsigned int )),=0A=
+             Qt::BlockingQueuedConnection );=0A=
+    }=0A=
+=0A=
     CONNECT( this, askUpdate(), this, doComponentsUpdate() );=0A=
 =0A=
     /* Size and placement of interface */=0A=
@@ -661,6 +667,9 @@ WId MainInterface::requestVideo( vout_thread_t =
*p_nvout, int *pi_x,=0A=
         else=0A=
             bgWasVisible =3D false;=0A=
 =0A=
+        /* ask videoWidget to show */=0A=
+        emit askVideoToShow( *pi_width, *pi_height );=0A=
+=0A=
         /* Consider the video active now */=0A=
         videoIsActive =3D true;=0A=
 =0A=
diff --git a/modules/gui/qt4/main_interface.hpp =
b/modules/gui/qt4/main_interface.hpp=0A=
index 8528171..c26a275 100644=0A=
--- a/modules/gui/qt4/main_interface.hpp=0A=
+++ b/modules/gui/qt4/main_interface.hpp=0A=
@@ -175,6 +175,7 @@ private slots:=0A=
 signals:=0A=
     void askReleaseVideo( );=0A=
     void askVideoToResize( unsigned int, unsigned int );=0A=
+    void askVideoToShow( unsigned int, unsigned int );=0A=
     void askVideoToToggle();=0A=
     void askBgWidgetToToggle();=0A=
     void askUpdate();=0A=
-- =0A=
1.5.2.5=0A=
=0A=

------=_NextPart_000_002A_01C98EF5.5C1CE8E0
Content-Type: application/octet-stream;
	name="0002-Helper-patch-to-debug-VideoWidget-BackgroundWidget-r.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="0002-Helper-patch-to-debug-VideoWidget-BackgroundWidget-r.patch"