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

Thanks a lot to ipkiss for providing the bisect builds and geal for his help.

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 1c028b74204f777bb38f320a4f0c707a367588c9..58b40b807e4d577abd3948ae131096de945ed505 100644 (file)
--- 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 5d5728616866a6fe82ed1fe046326bd29001c08f..3e1a007f42445e13bc68ad15f6d0e8c879766264 100644 (file)
--- 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 55559fd4c69bcb3f3aca1d54cd652c1b72bffd1a..1888a2553baf64c0fab16cff6433fb0db0be2b5b 100644 (file)
--- 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.
  *****************************************************************************/