From 88f22433f672be32b1488e22a5b30a693ccff500 Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Sat, 13 Sep 2008 18:43:53 +0200 Subject: [PATCH] =?utf8?q?\o/=20skins2=20work=20on=20win32=20\o/=20<(?= =?utf8?q?=C2=B0v=C2=B0<)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Thanks a lot to ipkiss for providing the bisect builds and geal for his help. --- include/vlc_interface.h | 2 +- modules/gui/skins2/src/skin_main.cpp | 4 ++++ src/interface/interface.c | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 1c028b7420..58b40b807e 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -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 diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 5d57286168..3e1a007f42 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -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 ); } diff --git a/src/interface/interface.c b/src/interface/interface.c index 55559fd4c6..1888a2553b 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -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. *****************************************************************************/ -- 2.39.2