Commit 48785825 authored by Rafaël Carré's avatar Rafaël Carré

qt4: do not access a widget from another thread

parent 4714362c
...@@ -57,6 +57,7 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) ...@@ -57,6 +57,7 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
vlc_mutex_init( p_intf, &lock ); vlc_mutex_init( p_intf, &lock );
p_vout = NULL; p_vout = NULL;
CONNECT( this, askResize(), this, SetMinSize() ); CONNECT( this, askResize(), this, SetMinSize() );
CONNECT( this, askVideoToShow(), this, show() );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
} }
...@@ -88,7 +89,7 @@ QSize VideoWidget::sizeHint() const ...@@ -88,7 +89,7 @@ QSize VideoWidget::sizeHint() const
void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, 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 )
{ {
show(); emit askVideoToShow();
if( p_vout ) if( p_vout )
{ {
msg_Dbg( p_intf, "embedded video already in use" ); msg_Dbg( p_intf, "embedded video already in use" );
......
...@@ -66,6 +66,7 @@ private: ...@@ -66,6 +66,7 @@ private:
vlc_mutex_t lock; vlc_mutex_t lock;
signals: signals:
void askResize(); void askResize();
void askVideoToShow();
private slots: private slots:
void SetMinSize(); void SetMinSize();
}; };
......
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