\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 e268c7c8d0fb1764ff21bb7606bfca341c2d4ed7..1888a2553baf64c0fab16cff6433fb0db0be2b5b 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -43,14 +43,13 @@
 #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__
+#if defined( __APPLE__ ) || defined( WIN32 )
 static void * MonitorLibVLCDeath( vlc_object_t *p_this );
 #endif
 static int AddIntfCallback( vlc_object_t *, char const *,
@@ -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 )
@@ -197,7 +196,6 @@ 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 */
@@ -223,48 +221,16 @@ 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 );
-
-        /* 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 );
+    /* Give control to the interface */
+    if( p_intf->pf_run )
+        p_intf->pf_run( p_intf );
 
-    vlc_restorecancel (canc);
     return NULL;
 }
 
-#ifdef __APPLE__
+#if defined( __APPLE__ ) || defined( WIN32 )
 /*****************************************************************************
  * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
  *****************************************************************************/