Skip to content

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

Qt4: compile fix

parent 2a4bf84c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/gui/qt4/qt4.cpp
View file @ 9fe946c3
...@@ -57,7 +57,7 @@ static int OpenDialogs ( vlc_object_t * ); ...@@ -57,7 +57,7 @@ static int OpenDialogs ( vlc_object_t * );
static int WindowOpen ( vlc_object_t * ); static int WindowOpen ( vlc_object_t * );
static void WindowClose ( vlc_object_t * ); static void WindowClose ( vlc_object_t * );
static void Run ( intf_thread_t * ); static void Run ( intf_thread_t * );
static void Init ( intf_thread_t * ); static void *Init ( vlc_object_t * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/***************************************************************************** /*****************************************************************************
...@@ -294,14 +294,15 @@ static void Run( intf_thread_t *p_intf ) ...@@ -294,14 +294,15 @@ static void Run( intf_thread_t *p_intf )
msg_Err( p_intf, "failed to create Qt dialogs thread" ); msg_Err( p_intf, "failed to create Qt dialogs thread" );
} }
else else
Init( p_intf ); Init( VLC_OBJECT(p_intf) );
} }
static QMutex windowLock; static QMutex windowLock;
static QWaitCondition windowWait; static QWaitCondition windowWait;
static void Init( intf_thread_t *p_intf ) static void *Init( vlc_object_t *obj )
{ {
intf_thread_t *p_intf = (intf_thread_t *)obj;
vlc_value_t val; vlc_value_t val;
char dummy[] = ""; char dummy[] = "";
char *argv[] = { dummy }; char *argv[] = { dummy };
......
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