Commit 88f22433 authored by Antoine Cellerier's avatar Antoine Cellerier

\o/ skins2 work on win32 \o/ <(°v°<)

Thanks a lot to ipkiss for providing the bisect builds and geal for his help.
parent d5845675
......@@ -50,7 +50,7 @@ struct intf_thread_t
VLC_COMMON_MEMBERS
/* Thread properties and locks */
#ifdef __APPLE__
#if defined( __APPLE__ ) || defined( WIN32 )
bool b_should_run_on_first_thread;
#endif
......
......@@ -157,6 +157,10 @@ static int Open( vlc_object_t *p_this )
Dialogs::instance( p_intf );
ThemeRepository::instance( p_intf );
#ifdef WIN32
p_intf->b_should_run_on_first_thread = true;
#endif
return( VLC_SUCCESS );
}
......
......@@ -49,7 +49,7 @@
* Local prototypes
*****************************************************************************/
static void* RunInterface( vlc_object_t *p_this );
#ifdef __APPLE__
#if defined( __APPLE__ ) || defined( WIN32 )
static void * MonitorLibVLCDeath( vlc_object_t *p_this );
#endif
static int AddIntfCallback( vlc_object_t *, char const *,
......@@ -95,7 +95,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
if( !p_intf )
return NULL;
p_intf->b_interaction = false;
#ifdef __APPLE__
#if defined( __APPLE__ ) || defined( WIN32 )
p_intf->b_should_run_on_first_thread = false;
#endif
......@@ -138,7 +138,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
*/
int intf_RunThread( intf_thread_t *p_intf )
{
#ifdef __APPLE__
#if defined( __APPLE__ ) || defined( WIN32 )
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
if( p_intf->b_should_run_on_first_thread )
......@@ -230,7 +230,7 @@ static void* RunInterface( vlc_object_t *p_this )
return NULL;
}
#ifdef __APPLE__
#if defined( __APPLE__ ) || defined( WIN32 )
/*****************************************************************************
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*****************************************************************************/
......
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