Commit f221d63c 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.
(cherry picked from commit 88f22433)
parent f66511cc
...@@ -50,7 +50,7 @@ struct intf_thread_t ...@@ -50,7 +50,7 @@ struct intf_thread_t
VLC_COMMON_MEMBERS VLC_COMMON_MEMBERS
/* Thread properties and locks */ /* Thread properties and locks */
#ifdef __APPLE__ #if defined( __APPLE__ ) || defined( WIN32 )
bool b_should_run_on_first_thread; bool b_should_run_on_first_thread;
#endif #endif
......
...@@ -157,6 +157,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -157,6 +157,10 @@ static int Open( vlc_object_t *p_this )
Dialogs::instance( p_intf ); Dialogs::instance( p_intf );
ThemeRepository::instance( p_intf ); ThemeRepository::instance( p_intf );
#ifdef WIN32
p_intf->b_should_run_on_first_thread = true;
#endif
return( VLC_SUCCESS ); return( VLC_SUCCESS );
} }
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static void* RunInterface( vlc_object_t *p_this ); static void* RunInterface( vlc_object_t *p_this );
#ifdef __APPLE__ #if defined( __APPLE__ ) || defined( WIN32 )
static void * MonitorLibVLCDeath( vlc_object_t *p_this ); static void * MonitorLibVLCDeath( vlc_object_t *p_this );
#endif #endif
static int AddIntfCallback( vlc_object_t *, char const *, static int AddIntfCallback( vlc_object_t *, char const *,
...@@ -96,7 +96,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) ...@@ -96,7 +96,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
if( !p_intf ) if( !p_intf )
return NULL; return NULL;
p_intf->b_interaction = false; p_intf->b_interaction = false;
#ifdef __APPLE__ #if defined( __APPLE__ ) || defined( WIN32 )
p_intf->b_should_run_on_first_thread = false; p_intf->b_should_run_on_first_thread = false;
#endif #endif
...@@ -139,7 +139,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) ...@@ -139,7 +139,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
*/ */
int intf_RunThread( intf_thread_t *p_intf ) int intf_RunThread( intf_thread_t *p_intf )
{ {
#ifdef __APPLE__ #if defined( __APPLE__ ) || defined( WIN32 )
/* Hack to get Mac OS X Cocoa runtime running /* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */ * (it needs access to the main thread) */
if( p_intf->b_should_run_on_first_thread ) if( p_intf->b_should_run_on_first_thread )
...@@ -261,7 +261,7 @@ static void* RunInterface( vlc_object_t *p_this ) ...@@ -261,7 +261,7 @@ static void* RunInterface( vlc_object_t *p_this )
return NULL; return NULL;
} }
#ifdef __APPLE__ #if defined( __APPLE__ ) || defined( WIN32 )
/***************************************************************************** /*****************************************************************************
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set. * 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