Commit 68cb7744 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Resize the video to the normal size on launch

parent 14440202
...@@ -74,10 +74,9 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) ...@@ -74,10 +74,9 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
setAttribute( Qt::WA_PaintOnScreen, true ); setAttribute( Qt::WA_PaintOnScreen, true );
/* The core can ask through a callback to show the video. */ /* The core can ask through a callback to show the video. */
connect( this, SIGNAL(askVideoWidgetToShow()), this, SLOT(show()), Qt::BlockingQueuedConnection ); connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
this, SLOT(SetSizing(unsigned int, unsigned int )),
/* The core can ask through a callback to resize the video */ Qt::BlockingQueuedConnection );
// CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) );
} }
void VideoWidget::paintEvent(QPaintEvent *ev) void VideoWidget::paintEvent(QPaintEvent *ev)
...@@ -115,7 +114,7 @@ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, ...@@ -115,7 +114,7 @@ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
unsigned int *pi_width, unsigned int *pi_height ) unsigned int *pi_width, unsigned int *pi_height )
{ {
msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y ); msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
emit askVideoWidgetToShow(); emit askVideoWidgetToShow( *pi_width, *pi_height );
if( p_vout ) if( p_vout )
{ {
msg_Dbg( p_intf, "embedded video already in use" ); msg_Dbg( p_intf, "embedded video already in use" );
...@@ -134,6 +133,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h ) ...@@ -134,6 +133,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h ); msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h );
videoSize.rwidth() = w; videoSize.rwidth() = w;
videoSize.rheight() = h; videoSize.rheight() = h;
if( isHidden() ) show();
updateGeometry(); // Needed for deinterlace updateGeometry(); // Needed for deinterlace
} }
......
...@@ -91,8 +91,7 @@ private: ...@@ -91,8 +91,7 @@ private:
QSize videoSize; QSize videoSize;
signals: signals:
void askVideoWidgetToShow(); void askVideoWidgetToShow( unsigned int, unsigned int );
//void askResize();
public slots: public slots:
void SetSizing( unsigned int, unsigned int ); void SetSizing( unsigned int, unsigned int );
......
...@@ -692,7 +692,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, ...@@ -692,7 +692,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
#endif #endif
videoIsActive = true; videoIsActive = true;
emit askVideoToResize( *pi_width, *pi_height ); // emit askVideoToResize( *pi_width, *pi_height );
emit askUpdate(); emit askUpdate();
fullscreenControls->regFullscreenCallback( p_nvout ); fullscreenControls->regFullscreenCallback( p_nvout );
......
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