Commit 7353924f authored by Joseph Tulou's avatar Joseph Tulou Committed by Jean-Baptiste Kempf

Ensure cone is hidden before video is shown in qt4 interface

Signed-off-by: default avatarJean-Baptiste Kempf <jb@sasmira.jbkempf.com>
parent 087123fe
......@@ -76,11 +76,6 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
Widgets with this attribute set do not participate in composition
management */
setAttribute( Qt::WA_PaintOnScreen, true );
/* The core can ask through a callback to show the video. */
connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
this, SLOT(SetSizing(unsigned int, unsigned int )),
Qt::BlockingQueuedConnection );
}
void VideoWidget::paintEvent(QPaintEvent *ev)
......@@ -112,7 +107,6 @@ WId VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
*pi_height = size().height();
}
emit askVideoWidgetToShow( *pi_width, *pi_height );
if( p_vout )
{
msg_Dbg( p_intf, "embedded video already in use" );
......
......@@ -80,9 +80,6 @@ private:
QSize videoSize;
signals:
void askVideoWidgetToShow( unsigned int, unsigned int );
public slots:
void SetSizing( unsigned int, unsigned int );
......
......@@ -214,9 +214,15 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
this, SLOT(releaseVideoSlot( void )), Qt::BlockingQueuedConnection );
if( videoWidget )
{
CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
videoWidget, SetSizing( unsigned int, unsigned int ) );
connect( this, SIGNAL(askVideoToShow( unsigned int, unsigned int)),
videoWidget, SLOT(SetSizing(unsigned int, unsigned int )),
Qt::BlockingQueuedConnection );
}
CONNECT( this, askUpdate(), this, doComponentsUpdate() );
/* Size and placement of interface */
......@@ -662,6 +668,9 @@ WId MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
else
bgWasVisible = false;
/* ask videoWidget to show */
emit askVideoToShow( *pi_width, *pi_height );
/* Consider the video active now */
videoIsActive = true;
......
......@@ -174,6 +174,7 @@ private slots:
signals:
void askReleaseVideo( );
void askVideoToResize( unsigned int, unsigned int );
void askVideoToShow( unsigned int, unsigned int );
void askVideoToToggle();
void askBgWidgetToToggle();
void askUpdate();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment