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

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 7e4c845cb26560b8a11e8006c7c183dcb6aa5eda..1888a2553baf64c0fab16cff6433fb0db0be2b5b 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -43,15 +43,14 @@
 #include <vlc_vout.h>
 
 #include "vlc_interface.h"
-#include "modules/modules.h" // Gruik!
 #include "libvlc.h"
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static void* RunInterface( vlc_object_t *p_this );
-#ifdef __APPLE__
-static void MonitorLibVLCDeath( intf_thread_t *p_intf );
+#if defined( __APPLE__ ) || defined( WIN32 )
+static void * MonitorLibVLCDeath( vlc_object_t *p_this );
 #endif
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
@@ -96,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
 
@@ -139,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 )
@@ -150,7 +149,7 @@ int intf_RunThread( intf_thread_t *p_intf )
             msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
             return VLC_EGENERIC;
         }
-        RunInterface( p_intf );
+        RunInterface( VLC_OBJECT(p_intf) );
 
         /* Make sure our MonitorLibVLCDeath thread exit */
         vlc_object_kill( p_intf );
@@ -197,7 +196,7 @@ static void* RunInterface( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
     vlc_value_t val, text;
-    char *psz_intf;
+    int canc = vlc_savecancel ();
 
     /* Variable used for interface spawning */
     var_Create( p_intf, "intf-add", VLC_VAR_STRING |
@@ -222,59 +221,32 @@ static void* RunInterface( vlc_object_t *p_this )
     var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
 
     var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
+    vlc_restorecancel (canc);
 
-    do
-    {
-        /* Give control to the interface */
-        if( p_intf->pf_run )
-            p_intf->pf_run( p_intf );
-        else
-        {
-            vlc_object_lock( p_intf );
-            while( vlc_object_alive( p_intf ) )
-                vlc_object_wait( p_intf );
-            vlc_object_unlock( p_intf );
-        }
-
-        if( !p_intf->psz_switch_intf )
-        {
-            break;
-        }
-
-        /* Make sure the old interface is completely uninitialized */
-        module_Unneed( p_intf, p_intf->p_module );
+    /* Give control to the interface */
+    if( p_intf->pf_run )
+        p_intf->pf_run( p_intf );
 
-        /* Provide ability to switch the main interface on the fly */
-        psz_intf = p_intf->psz_switch_intf;
-        p_intf->psz_switch_intf = NULL;
-
-        vlc_object_lock( p_intf );
-        p_intf->b_die = false; /* FIXME */
-        p_intf->b_dead = false;
-
-        vlc_object_unlock( p_intf );
-
-        p_intf->psz_intf = psz_intf;
-        p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
-    }
-    while( p_intf->p_module );
     return NULL;
 }
 
-#ifdef __APPLE__
+#if defined( __APPLE__ ) || defined( WIN32 )
 /*****************************************************************************
  * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
  *****************************************************************************/
-static void MonitorLibVLCDeath( intf_thread_t *p_intf )
+static void * MonitorLibVLCDeath( vlc_object_t * p_this )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
     libvlc_int_t * p_libvlc = p_intf->p_libvlc;
+    int canc = vlc_savecancel ();
+
     vlc_object_lock( p_libvlc );
     while(vlc_object_alive( p_libvlc ) )
     {
         if(p_intf->b_die)
         {
             vlc_object_unlock( p_libvlc );
-            return;
+            return NULL;
         }
         vlc_object_wait( p_libvlc );
     }
@@ -291,6 +263,8 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
         vlc_object_kill( p_intf );
     }
     vlc_list_release( p_list );
+    vlc_restorecancel (canc);
+    return NULL;
 }
 #endif