Skip to content

V
vlc
Commit 64443848 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: use semaphore

parent ef551582
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
modules/gui/qt4/qt4.cpp
View file @ 64443848
...@@ -263,11 +263,7 @@ vlc_module_end () ...@@ -263,11 +263,7 @@ vlc_module_end ()
/*****************************************/ /*****************************************/
/* Ugly, but the Qt4 interface assumes single instance anyway */ /* Ugly, but the Qt4 interface assumes single instance anyway */
static struct static vlc_sem_t ready;
{
QMutex lock;
QWaitCondition ready;
} iface;
/***************************************************************************** /*****************************************************************************
* Module callbacks * Module callbacks
...@@ -298,6 +294,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -298,6 +294,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_playlist = pl_Hold( p_intf ); p_sys->p_playlist = pl_Hold( p_intf );
/* */ /* */
vlc_sem_init (&ready, 0);
if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{ {
pl_Release (p_sys->p_playlist); pl_Release (p_sys->p_playlist);
...@@ -306,13 +303,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -306,13 +303,12 @@ static int Open( vlc_object_t *p_this )
} }
/* */ /* */
QMutexLocker locker (&iface.lock); vlc_sem_wait (&ready);
vlc_value_t val; vlc_sem_destroy (&ready);
while( p_sys->p_mi == NULL && !p_sys->b_isDialogProvider )
iface.ready.wait( &iface.lock );
if( !p_sys->b_isDialogProvider ) if( !p_sys->b_isDialogProvider )
{ {
vlc_value_t val;
var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS); var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS);
val.p_address = p_this; val.p_address = p_this;
var_Set (p_this->p_libvlc, "qt4-iface", val); var_Set (p_this->p_libvlc, "qt4-iface", val);
...@@ -419,11 +415,9 @@ static void *Thread( void *obj ) ...@@ -419,11 +415,9 @@ static void *Thread( void *obj )
p_mi = NULL; p_mi = NULL;
/* */ /* */
iface.lock.lock();
p_intf->p_sys->p_mi = p_mi; p_intf->p_sys->p_mi = p_mi;
p_intf->p_sys->b_isDialogProvider = p_mi == NULL; p_intf->p_sys->b_isDialogProvider = p_mi == NULL;
iface.ready.wakeAll(); vlc_sem_post (&ready);
iface.lock.unlock();
/* Explain to the core how to show a dialog :D */ /* Explain to the core how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog; p_intf->pf_show_dialog = ShowDialog;
......
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