[vlc-devel] commit: \o/ skins2 work on win32 \o/ <( °v° <) ( Antoine Cellerier )

[git version control]

vlc | branch: 0.9-bugfix | Antoine Cellerier <dionoea at videolan.org> | Sat Sep 13 18:43:53 2008 +0200| [f221d63c7862e754e7c999eeb2ee57d445b42098] | committer: 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 88f22433f672be32b1488e22a5b30a693ccff500)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f221d63c7862e754e7c999eeb2ee57d445b42098
---

 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 0fb7b6c..0270b96 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 a78cc6a..84651ab 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 990335d..c4b031e 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -50,7 +50,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 *,
@@ -96,7 +96,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
 
@@ -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 )
 {
-#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 )
@@ -261,7 +261,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.
  *****************************************************************************/