Commit 6059d32e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove superfluous locking

parent 19685d00
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <QPalette> #include <QPalette>
#include <QResizeEvent> #include <QResizeEvent>
#include <QDate> #include <QDate>
#include <QMutexLocker>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
# include <X11/Xlib.h> # include <X11/Xlib.h>
# include <qx11info_x11.h> # include <qx11info_x11.h>
...@@ -63,7 +62,6 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) ...@@ -63,7 +62,6 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
/* Init */ /* Init */
vlc_mutex_init( &lock ); vlc_mutex_init( &lock );
p_vout = NULL; p_vout = NULL;
handleReady = false;
hide(); setMinimumSize( 16, 16 ); hide(); setMinimumSize( 16, 16 );
videoSize.rwidth() = -1; videoSize.rwidth() = -1;
videoSize.rheight() = -1; videoSize.rheight() = -1;
...@@ -93,9 +91,6 @@ void VideoWidget::paintEvent(QPaintEvent *ev) ...@@ -93,9 +91,6 @@ void VideoWidget::paintEvent(QPaintEvent *ev)
#ifdef Q_WS_X11 #ifdef Q_WS_X11
XFlush( QX11Info::display() ); XFlush( QX11Info::display() );
#endif #endif
QMutexLocker locker( &handleLock );
handleReady = true;
handleWait.wakeAll();
} }
VideoWidget::~VideoWidget() VideoWidget::~VideoWidget()
...@@ -124,7 +119,6 @@ VideoWidget::~VideoWidget() ...@@ -124,7 +119,6 @@ VideoWidget::~VideoWidget()
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 )
{ {
QMutexLocker locker( &handleLock );
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();
if( p_vout ) if( p_vout )
...@@ -133,11 +127,6 @@ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, ...@@ -133,11 +127,6 @@ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
return NULL; return NULL;
} }
p_vout = p_nvout; p_vout = p_nvout;
while( !handleReady )
{
msg_Dbg( p_intf, "embedded video pending (handle %p)", winId() );
handleWait.wait( &handleLock );
}
msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() ); msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() );
return ( void* )winId(); return ( void* )winId();
} }
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include <QWidget> #include <QWidget>
#include <QFrame> #include <QFrame>
#include <QMutex>
#include <QWaitCondition>
#define VOLUME_MAX 200 #define VOLUME_MAX 200
...@@ -91,9 +89,6 @@ private: ...@@ -91,9 +89,6 @@ private:
vlc_mutex_t lock; vlc_mutex_t lock;
QSize videoSize; QSize videoSize;
QMutex handleLock;
QWaitCondition handleWait;
bool handleReady;
signals: signals:
void askVideoWidgetToShow(); void askVideoWidgetToShow();
......
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