X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fskins2%2Fsrc%2Fskin_main.cpp;h=2fbf3ba9d8897b82fd470d588210a8caeffc3862;hb=56220f86120b3d7b7d8c7b2957befede19f669b6;hp=fef92fc3e5d7edac6f13c408c934b533208f17ba;hpb=55c960749e8f91763e720ac610d5dd56f90fcde1;p=vlc

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index fef92fc3e5..2fbf3ba9d8 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -26,13 +26,14 @@
 # include "config.h"
 #endif
 
+#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
-#include <vlc_demux.h>
 #include <vlc_playlist.h>
 #include <vlc_threads.h>
-#include <vlc_window.h>
+#include <vlc_vout_window.h>
+#include <vlc_vout_display.h>
 
 #include "dialogs.hpp"
 #include "os_factory.hpp"
@@ -44,42 +45,24 @@
 #include "theme_repository.hpp"
 #include "vout_window.hpp"
 #include "vout_manager.hpp"
+#include "art_manager.hpp"
 #include "../parser/interpreter.hpp"
 #include "../commands/async_queue.hpp"
 #include "../commands/cmd_quit.hpp"
 #include "../commands/cmd_dialogs.hpp"
 #include "../commands/cmd_minimize.hpp"
-
-//---------------------------------------------------------------------------
-// Exported interface functions.
-//---------------------------------------------------------------------------
-#ifdef WIN32_SKINS
-extern "C" __declspec( dllexport )
-    int __VLC_SYMBOL( vlc_entry ) ( module_t *p_module );
-#endif
-
+#include "../commands/cmd_playlist.hpp"
+#include "../commands/cmd_callbacks.hpp"
+#include "../commands/cmd_show_window.hpp"
+#include "../commands/cmd_resize.hpp"
+#include "../commands/cmd_on_top.hpp"
 
 //---------------------------------------------------------------------------
 // Local prototypes
 //---------------------------------------------------------------------------
 static int  Open  ( vlc_object_t * );
 static void Close ( vlc_object_t * );
-static void Run   ( intf_thread_t * );
-
-static int DemuxOpen( vlc_object_t * );
-static int Demux( demux_t * );
-static int DemuxControl( demux_t *, int, va_list );
-
-//---------------------------------------------------------------------------
-// Prototypes for configuration callbacks
-//---------------------------------------------------------------------------
-static int onSystrayChange( vlc_object_t *pObj, const char *pVariable,
-                            vlc_value_t oldVal, vlc_value_t newVal,
-                            void *pParam );
-static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
-                            vlc_value_t oldVal, vlc_value_t newVal,
-                            void *pParam );
-
+static void *Run  ( void * );
 
 static struct
 {
@@ -95,19 +78,12 @@ static int Open( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
     // Allocate instance and initialize some members
-    p_intf->p_sys = (intf_sys_t *) malloc( sizeof( intf_sys_t ) );
+    p_intf->p_sys = (intf_sys_t *) calloc( 1, sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-        return( VLC_ENOMEM );
-
-    p_intf->pf_run = Run;
-
-    // Suscribe to messages bank
-#if 0
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-#endif
+        return VLC_ENOMEM;
 
     p_intf->p_sys->p_input = NULL;
-    p_intf->p_sys->p_playlist = pl_Hold( p_intf );
+    p_intf->p_sys->p_playlist = pl_Get( p_intf );
 
     // Initialize "singleton" objects
     p_intf->p_sys->p_logger = NULL;
@@ -124,119 +100,44 @@ static int Open( vlc_object_t *p_this )
     // No theme yet
     p_intf->p_sys->p_theme = NULL;
 
-    // Create a variable to be notified of skins to be loaded
-    var_Create( p_intf, "skin-to-load", VLC_VAR_STRING );
+    vlc_mutex_init( &p_intf->p_sys->init_lock );
+    vlc_cond_init( &p_intf->p_sys->init_wait );
 
-    // Initialize singletons
-    if( OSFactory::instance( p_intf ) == NULL )
-    {
-        msg_Err( p_intf, "cannot initialize OSFactory" );
-        pl_Release( p_intf );
-#if 0
-        msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
-        return VLC_EGENERIC;
-    }
-    if( AsyncQueue::instance( p_intf ) == NULL )
-    {
-        msg_Err( p_intf, "cannot initialize AsyncQueue" );
-        pl_Release( p_intf );
-#if 0
-        msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
-        return VLC_EGENERIC;
-    }
-    if( Interpreter::instance( p_intf ) == NULL )
-    {
-        msg_Err( p_intf, "cannot instanciate Interpreter" );
-        pl_Release( p_intf );
-#if 0
-        msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
-        return VLC_EGENERIC;
-    }
-    if( VarManager::instance( p_intf ) == NULL )
-    {
-        msg_Err( p_intf, "cannot instanciate VarManager" );
-        pl_Release( p_intf );
-#if 0
-        msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
-        return VLC_EGENERIC;
-    }
-    if( VlcProc::instance( p_intf ) == NULL )
-    {
-        msg_Err( p_intf, "cannot initialize VLCProc" );
-        pl_Release( p_intf );
-#if 0
-        msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
-        return VLC_EGENERIC;
-    }
-    if( VoutManager::instance( p_intf ) == NULL )
+    vlc_mutex_lock( &p_intf->p_sys->init_lock );
+    p_intf->p_sys->b_error = false;
+    p_intf->p_sys->b_ready = false;
+
+    if( vlc_clone( &p_intf->p_sys->thread, Run, p_intf,
+                               VLC_THREAD_PRIORITY_LOW ) )
     {
-        msg_Err( p_intf, "cannot instanciate VoutManager" );
-        pl_Release( p_intf );
+        vlc_mutex_unlock( &p_intf->p_sys->init_lock );
+
+        vlc_cond_destroy( &p_intf->p_sys->init_wait );
+        vlc_mutex_destroy( &p_intf->p_sys->init_lock );
+        free( p_intf->p_sys );
         return VLC_EGENERIC;
     }
-    vlc_mutex_lock( &skin_load.mutex );
-    skin_load.intf = p_intf;
-    vlc_mutex_unlock( &skin_load.mutex );
-
-    Dialogs::instance( p_intf );
-    ThemeRepository::instance( p_intf );
-
-    // Load a theme
-    char *skin_last = config_GetPsz( p_intf, "skins2-last" );
 
-    ThemeLoader *pLoader = new ThemeLoader( p_intf );
+    while( !p_intf->p_sys->b_ready )
+        vlc_cond_wait( &p_intf->p_sys->init_wait, &p_intf->p_sys->init_lock );
+    vlc_mutex_unlock( &p_intf->p_sys->init_lock );
 
-    if( !skin_last || !*skin_last || !pLoader->load( skin_last ) )
+    if( p_intf->p_sys->b_error )
     {
-        // Get the resource path and try to load the default skin
-        OSFactory *pOSFactory = OSFactory::instance( p_intf );
-        const list<string> &resPath = pOSFactory->getResourcePath();
-        const string &sep = pOSFactory->getDirSeparator();
+        vlc_join( p_intf->p_sys->thread, NULL );
 
-        list<string>::const_iterator it;
-        for( it = resPath.begin(); it != resPath.end(); it++ )
-        {
-            string path = (*it) + sep + "default.vlt";
-            if( pLoader->load( path ) )
-            {
-                // Theme loaded successfully
-                break;
-            }
-        }
-        if( it == resPath.end() )
-        {
-            // Last chance: the user can select a new theme file
-            if( Dialogs::instance( p_intf ) )
-            {
-                CmdDlgChangeSkin *pCmd = new CmdDlgChangeSkin( p_intf );
-                AsyncQueue *pQueue = AsyncQueue::instance( p_intf );
-                pQueue->push( CmdGenericPtr( pCmd ) );
-            }
-            else
-            {
-                // No dialogs provider, just quit...
-                CmdQuit *pCmd = new CmdQuit( p_intf );
-                AsyncQueue *pQueue = AsyncQueue::instance( p_intf );
-                pQueue->push( CmdGenericPtr( pCmd ) );
-                msg_Err( p_intf,
-                         "cannot show the \"open skin\" dialog: exiting...");
-            }
-        }
-    }
-    delete pLoader;
+        vlc_mutex_destroy( &p_intf->p_sys->init_lock );
+        vlc_cond_destroy( &p_intf->p_sys->init_wait );
 
-    free( skin_last );
+        free( p_intf->p_sys );
+        return VLC_EGENERIC;
+    }
 
-#ifdef WIN32
-    p_intf->b_should_run_on_first_thread = true;
-#endif
+    vlc_mutex_lock( &skin_load.mutex );
+    skin_load.intf = p_intf;
+    vlc_mutex_unlock( &skin_load.mutex );
 
-    return( VLC_SUCCESS );
+    return VLC_SUCCESS;
 }
 
 //---------------------------------------------------------------------------
@@ -248,37 +149,29 @@ static void Close( vlc_object_t *p_this )
 
     msg_Dbg( p_intf, "closing skins2 module" );
 
+    /* Terminate input to ensure that our window provider is released. */
+    playlist_Deactivate( p_intf->p_sys->p_playlist );
+
     vlc_mutex_lock( &skin_load.mutex );
     skin_load.intf = NULL;
     vlc_mutex_unlock( &skin_load.mutex);
 
-    if( p_intf->p_sys->p_theme )
+    AsyncQueue *pQueue = p_intf->p_sys->p_queue;
+    if( pQueue )
     {
-        delete p_intf->p_sys->p_theme;
-        p_intf->p_sys->p_theme = NULL;
-        msg_Dbg( p_intf, "current theme deleted" );
+        CmdGeneric *pCmd = new CmdExitLoop( p_intf );
+        if( pCmd )
+            pQueue->push( CmdGenericPtr( pCmd ) );
     }
-
-    // Destroy "singleton" objects
-    OSFactory::instance( p_intf )->destroyOSLoop();
-    ThemeRepository::destroy( p_intf );
-    VoutManager::destroy( p_intf );
-    //Dialogs::destroy( p_intf );
-    Interpreter::destroy( p_intf );
-    AsyncQueue::destroy( p_intf );
-    VarManager::destroy( p_intf );
-    VlcProc::destroy( p_intf );
-    OSFactory::destroy( p_intf );
-
-    if( p_intf->p_sys->p_playlist )
+    else
     {
-        vlc_object_release( p_intf->p_sys->p_playlist );
+        msg_Err( p_intf, "thread found already stopped (weird!)" );
     }
 
-    // Unsubscribe from messages bank
-#if 0
-    msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-#endif
+    vlc_join( p_intf->p_sys->thread, NULL );
+
+    vlc_mutex_destroy( &p_intf->p_sys->init_lock );
+    vlc_cond_destroy( &p_intf->p_sys->init_wait );
 
     // Destroy structure
     free( p_intf->p_sys );
@@ -288,202 +181,302 @@ static void Close( vlc_object_t *p_this )
 //---------------------------------------------------------------------------
 // Run: main loop
 //---------------------------------------------------------------------------
-static void Run( intf_thread_t *p_intf )
+static void *Run( void * p_obj )
 {
     int canc = vlc_savecancel();
 
-    // Get the instance of OSLoop
-    OSLoop *loop = OSFactory::instance( p_intf )->getOSLoop();
+    intf_thread_t *p_intf = (intf_thread_t *)p_obj;
 
-    // Enter the main event loop
-    loop->run();
+    bool b_error = false;
+    char *skin_last = NULL;
+    ThemeLoader *pLoader = NULL;
+    OSLoop *loop = NULL;
 
-    // Delete the theme and save the configuration of the windows
-    if( p_intf->p_sys->p_theme )
+    vlc_mutex_lock( &p_intf->p_sys->init_lock );
+
+    // Initialize singletons
+    if( OSFactory::instance( p_intf ) == NULL )
     {
-        p_intf->p_sys->p_theme->saveConfig();
+        msg_Err( p_intf, "cannot initialize OSFactory" );
+        b_error = true;
+        goto end;
+    }
+    if( AsyncQueue::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot initialize AsyncQueue" );
+        b_error = true;
+        goto end;
+    }
+    if( Interpreter::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate Interpreter" );
+        b_error = true;
+        goto end;
+    }
+    if( VarManager::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate VarManager" );
+        b_error = true;
+        goto end;
+    }
+    if( VlcProc::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot initialize VLCProc" );
+        b_error = true;
+        goto end;
+    }
+    if( VoutManager::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate VoutManager" );
+        b_error = true;
+        goto end;
+    }
+    if( ArtManager::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate ArtManager" );
+        b_error = true;
+        goto end;
+    }
+    if( ThemeRepository::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate ThemeRepository" );
+        b_error = true;
+        goto end;
+    }
+    if( Dialogs::instance( p_intf ) == NULL )
+    {
+        msg_Err( p_intf, "cannot instantiate qt4 dialogs provider" );
+        b_error = true;
+        goto end;
     }
 
-    // cannot be called in "Close", because it refcounts skins2
-    Dialogs::destroy( p_intf );
+    // Load a theme
+    skin_last = config_GetPsz( p_intf, "skins2-last" );
+    pLoader = new ThemeLoader( p_intf );
 
-    vlc_restorecancel(canc);
-}
+    if( !skin_last || !pLoader->load( skin_last ) )
+    {
+        // No skins (not even the default one). let's quit
+        CmdQuit *pCmd = new CmdQuit( p_intf );
+        AsyncQueue *pQueue = AsyncQueue::instance( p_intf );
+        pQueue->push( CmdGenericPtr( pCmd ) );
+        msg_Err( p_intf, "no skins found : exiting");
+    }
 
+    delete pLoader;
+    free( skin_last );
 
-// Callbacks for vout requests
-static int WindowOpen( vlc_object_t *p_this )
-{
-    vout_window_t *pWnd = (vout_window_t *)p_this;
-    intf_thread_t *pIntf = (intf_thread_t *)
-        vlc_object_find_name( p_this, "skins2", FIND_ANYWHERE );
+    // Get the instance of OSLoop
+    loop = OSFactory::instance( p_intf )->getOSLoop();
 
-    if( pIntf == NULL )
-        return VLC_EGENERIC;
+    // Signal the main thread this thread is now ready
+    p_intf->p_sys->b_error = false;
+    p_intf->p_sys->b_ready = true;
+    vlc_cond_signal( &p_intf->p_sys->init_wait );
+    vlc_mutex_unlock( &p_intf->p_sys->init_lock );
 
-    vlc_object_release( pIntf );
+    // Enter the main event loop
+    loop->run();
 
-    pWnd->handle.hwnd = VoutManager::getWindow( pIntf, pWnd );
+    // Destroy OSLoop
+    OSFactory::instance( p_intf )->destroyOSLoop();
 
-    if( pWnd->handle.hwnd )
-    {
-        pWnd->p_private = pIntf;
-        pWnd->control = &VoutManager::controlWindow;
-        return VLC_SUCCESS;
-    }
-    else
+    // save and delete the theme
+    if( p_intf->p_sys->p_theme )
     {
-        return VLC_EGENERIC;
-    }
-}
-
-static void WindowClose( vlc_object_t *p_this )
-{
-    vout_window_t *pWnd = (vout_window_t *)p_this;
-    intf_thread_t *pIntf = (intf_thread_t *)p_this->p_private;
+        p_intf->p_sys->p_theme->saveConfig();
 
-    VoutManager::releaseWindow( pIntf, pWnd );
-}
+        delete p_intf->p_sys->p_theme;
+        p_intf->p_sys->p_theme = NULL;
 
-//---------------------------------------------------------------------------
-// DemuxOpen: initialize demux
-//---------------------------------------------------------------------------
-static int DemuxOpen( vlc_object_t *p_this )
-{
-    demux_t *p_demux = (demux_t*)p_this;
-    intf_thread_t *p_intf;
-    char *ext;
-
-    // Needed callbacks
-    p_demux->pf_demux   = Demux;
-    p_demux->pf_control = DemuxControl;
-
-    // Test that we have a valid .vlt or .wsz file, based on the extension
-    // TODO: an actual check of the contents would be better...
-    if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL ||
-        ( strcasecmp( ext, ".vlt" ) && strcasecmp( ext, ".wsz" ) ) )
-    {
-        return VLC_EGENERIC;
+        msg_Dbg( p_intf, "current theme deleted" );
     }
 
-    vlc_mutex_lock( &skin_load.mutex );
-    p_intf = skin_load.intf;
-    if( p_intf )
-        vlc_object_hold( p_intf );
-    vlc_mutex_unlock( &skin_load.mutex );
+    // save config file
+    config_SaveConfigFile( p_intf );
 
-    if( p_intf != NULL )
-    {
-        playlist_t *p_playlist = pl_Hold( p_this );
-        // Make sure the item is deleted afterwards
-        /// \bug does not always work
-        playlist_CurrentPlayingItem( p_playlist )->i_flags |= PLAYLIST_REMOVE_FLAG;
-        pl_Release( p_this );
-
-        var_SetString( p_intf, "skin-to-load", p_demux->psz_path );
-        vlc_object_release( p_intf );
-    }
-    else
+end:
+    // Destroy "singleton" objects
+    Dialogs::destroy( p_intf );
+    ThemeRepository::destroy( p_intf );
+    ArtManager::destroy( p_intf );
+    VoutManager::destroy( p_intf );
+    VlcProc::destroy( p_intf );
+    VarManager::destroy( p_intf );
+    Interpreter::destroy( p_intf );
+    AsyncQueue::destroy( p_intf );
+    OSFactory::destroy( p_intf );
+
+    if( b_error )
     {
-        msg_Warn( p_this,
-                  "skin could not be loaded (not using skins2 intf)" );
+        p_intf->p_sys->b_error = true;
+        p_intf->p_sys->b_ready = true;
+        vlc_cond_signal( &p_intf->p_sys->init_wait );
+        vlc_mutex_unlock( &p_intf->p_sys->init_lock );
     }
 
-    return VLC_SUCCESS;
+    vlc_restorecancel(canc);
+    return NULL;
 }
 
+static int  WindowOpen( vout_window_t *, const vout_window_cfg_t * );
+static void WindowClose( vout_window_t * );
+static int  WindowControl( vout_window_t *, int, va_list );
 
-//---------------------------------------------------------------------------
-// Demux: return EOF
-//---------------------------------------------------------------------------
-static int Demux( demux_t *p_demux )
+struct vout_window_sys_t
 {
-    return 0;
-}
+    intf_thread_t*     pIntf;
+    vout_window_cfg_t  cfg;
+};
 
-
-//---------------------------------------------------------------------------
-// DemuxControl
-//---------------------------------------------------------------------------
-static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
+static void WindowOpenLocal( intf_thread_t* pIntf, vlc_object_t *pObj )
 {
-    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+    vout_window_t* pWnd = (vout_window_t*)pObj;
+    int width = (int)pWnd->sys->cfg.width;
+    int height = (int)pWnd->sys->cfg.height;
+    VoutManager::instance( pIntf )->acceptWnd( pWnd, width, height );
 }
 
+static void WindowCloseLocal( intf_thread_t* pIntf, vlc_object_t *pObj )
+{
+    vout_window_t* pWnd = (vout_window_t*)pObj;
+    VoutManager::instance( pIntf )->releaseWnd( pWnd );
+}
 
-//---------------------------------------------------------------------------
-// Callbacks
-//---------------------------------------------------------------------------
-
-/// Callback for the systray configuration option
-static int onSystrayChange( vlc_object_t *pObj, const char *pVariable,
-                            vlc_value_t oldVal, vlc_value_t newVal,
-                            void *pParam )
+static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
 {
-    intf_thread_t *pIntf;
+    if( cfg->type != VOUT_WINDOW_TYPE_INVALID )
+    {
+#ifdef X11_SKINS
+        if( cfg->type != VOUT_WINDOW_TYPE_XID )
+#else
+        if( cfg->type != VOUT_WINDOW_TYPE_HWND )
+#endif
+            return VLC_EGENERIC;
+    }
+
+    vout_window_sys_t* sys;
 
     vlc_mutex_lock( &skin_load.mutex );
-    pIntf = skin_load.intf;
+    intf_thread_t *pIntf = skin_load.intf;
     if( pIntf )
         vlc_object_hold( pIntf );
     vlc_mutex_unlock( &skin_load.mutex );
 
     if( pIntf == NULL )
+        return VLC_EGENERIC;
+
+    if( !var_InheritBool( pIntf, "skinned-video") ||
+        cfg->is_standalone )
     {
+        vlc_object_release( pIntf );
         return VLC_EGENERIC;
     }
 
-    AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
-    if( newVal.b_bool )
+    sys = (vout_window_sys_t*)calloc( 1, sizeof( *sys ) );
+    if( !sys )
     {
-        CmdAddInTray *pCmd = new CmdAddInTray( pIntf );
-        pQueue->push( CmdGenericPtr( pCmd ) );
+        vlc_object_release( pIntf );
+        return VLC_ENOMEM;
     }
-    else
+
+    pWnd->sys = sys;
+    pWnd->sys->cfg = *cfg;
+    pWnd->sys->pIntf = pIntf;
+#ifdef X11_SKINS
+    pWnd->type = VOUT_WINDOW_TYPE_XID;
+#else
+    pWnd->type = VOUT_WINDOW_TYPE_HWND;
+#endif
+    pWnd->control = WindowControl;
+
+    // force execution in the skins2 thread context
+    CmdExecuteBlock* cmd = new CmdExecuteBlock( pIntf, VLC_OBJECT( pWnd ),
+                                                WindowOpenLocal );
+    CmdExecuteBlock::executeWait( CmdGenericPtr( cmd ) );
+
+#ifdef X11_SKINS
+    pWnd->display.x11 = NULL;
+
+    if( !pWnd->handle.xid )
+#else
+    if( !pWnd->handle.hwnd )
+#endif
     {
-        CmdRemoveFromTray *pCmd = new CmdRemoveFromTray( pIntf );
-        pQueue->push( CmdGenericPtr( pCmd ) );
+        free( sys );
+        vlc_object_release( pIntf );
+        return VLC_EGENERIC;
     }
 
-    vlc_object_release( pIntf );
     return VLC_SUCCESS;
 }
 
-
-/// Callback for the systray configuration option
-static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
-                            vlc_value_t oldVal, vlc_value_t newVal,
-                            void *pParam )
+static void WindowClose( vout_window_t *pWnd )
 {
-    intf_thread_t *pIntf;
+    vout_window_sys_t* sys = pWnd->sys;
+    intf_thread_t *pIntf = sys->pIntf;
 
-    vlc_mutex_lock( &skin_load.mutex );
-    pIntf = skin_load.intf;
-    if( pIntf )
-        vlc_object_hold( pIntf );
-    vlc_mutex_unlock( &skin_load.mutex );
+    // force execution in the skins2 thread context
+    CmdExecuteBlock* cmd = new CmdExecuteBlock( pIntf, VLC_OBJECT( pWnd ),
+                                                WindowCloseLocal );
+    CmdExecuteBlock::executeWait( CmdGenericPtr( cmd ) );
 
-    if( pIntf == NULL )
-    {
-        return VLC_EGENERIC;
-    }
+    vlc_object_release( sys->pIntf );
+    free( sys );
+}
 
+static int WindowControl( vout_window_t *pWnd, int query, va_list args )
+{
+    vout_window_sys_t* sys = pWnd->sys;
+    intf_thread_t *pIntf = sys->pIntf;
     AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
-    if( newVal.b_bool )
-    {
-        CmdAddInTaskBar *pCmd = new CmdAddInTaskBar( pIntf );
-        pQueue->push( CmdGenericPtr( pCmd ) );
-    }
-    else
+
+    switch( query )
     {
-        CmdRemoveFromTaskBar *pCmd = new CmdRemoveFromTaskBar( pIntf );
-        pQueue->push( CmdGenericPtr( pCmd ) );
-    }
+        case VOUT_WINDOW_SET_SIZE:
+        {
+            unsigned int i_width  = va_arg( args, unsigned int );
+            unsigned int i_height = va_arg( args, unsigned int );
 
-    vlc_object_release( pIntf );
-    return VLC_SUCCESS;
-}
+            if( i_width && i_height )
+            {
+                // Post a vout resize command
+                CmdResizeVout *pCmd =
+                    new CmdResizeVout( pIntf, pWnd,
+                                       (int)i_width, (int)i_height );
+                pQueue->push( CmdGenericPtr( pCmd ) );
+            }
+            return VLC_EGENERIC;
+        }
 
+        case VOUT_WINDOW_SET_FULLSCREEN:
+        {
+            bool b_fullscreen = va_arg( args, int );
+
+            // Post a set fullscreen command
+            CmdSetFullscreen* pCmd =
+                new CmdSetFullscreen( pIntf, pWnd, b_fullscreen );
+            pQueue->push( CmdGenericPtr( pCmd ) );
+            return VLC_SUCCESS;
+        }
+
+        case VOUT_WINDOW_SET_STATE:
+        {
+            unsigned i_arg = va_arg( args, unsigned );
+            unsigned on_top = i_arg & VOUT_WINDOW_STATE_ABOVE;
+
+            // Post a SetOnTop command
+            CmdSetOnTop* pCmd =
+                new CmdSetOnTop( pIntf, on_top );
+            pQueue->push( CmdGenericPtr( pCmd ) );
+            return VLC_SUCCESS;
+        }
+
+        default:
+            msg_Dbg( pIntf, "control query not supported" );
+            return VLC_EGENERIC;
+    }
+}
 
 //---------------------------------------------------------------------------
 // Module descriptor
@@ -503,28 +496,32 @@ static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
     " correctly.")
 #define SKINS2_PLAYLIST N_("Use a skinned playlist")
 #define SKINS2_PLAYLIST_LONG N_("Use a skinned playlist")
+#define SKINS2_VIDEO N_("Display video in a skinned window if any")
+#define SKINS2_VIDEO_LONG N_( \
+    "When set to 'no', this parameter is intended to give old skins a chance" \
+    " to play back video even though no video tag is implemented")
 
 vlc_module_begin ()
     set_category( CAT_INTERFACE )
     set_subcategory( SUBCAT_INTERFACE_MAIN )
-    add_file( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG,
-              true )
-        change_autosave ()
-    add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG,
+    add_loadfile( "skins2-last", "", SKINS2_LAST, SKINS2_LAST_LONG,
+                  true )
+    add_string( "skins2-config", "", SKINS2_CONFIG, SKINS2_CONFIG_LONG,
                 true )
-        change_autosave ()
-        change_internal ()
-#ifdef WIN32
-    add_bool( "skins2-systray", false, onSystrayChange, SKINS2_SYSTRAY,
+        change_private ()
+#ifdef _WIN32
+    add_bool( "skins2-systray", true, SKINS2_SYSTRAY,
               SKINS2_SYSTRAY_LONG, false );
-    add_bool( "skins2-taskbar", true, onTaskBarChange, SKINS2_TASKBAR,
+    add_bool( "skins2-taskbar", true, SKINS2_TASKBAR,
               SKINS2_TASKBAR_LONG, false );
-    add_bool( "skins2-transparency", false, NULL, SKINS2_TRANSPARENCY,
-              SKINS2_TRANSPARENCY_LONG, false );
 #endif
+    add_bool( "skins2-transparency", false, SKINS2_TRANSPARENCY,
+              SKINS2_TRANSPARENCY_LONG, false );
 
-    add_bool( "skinned-playlist", true, NULL, SKINS2_PLAYLIST,
+    add_bool( "skinned-playlist", true, SKINS2_PLAYLIST,
               SKINS2_PLAYLIST_LONG, false );
+    add_bool( "skinned-video", true, SKINS2_VIDEO,
+              SKINS2_VIDEO_LONG, false );
     set_shortname( N_("Skins"))
     set_description( N_("Skinnable Interface") )
     set_capability( "interface", 30 )
@@ -532,17 +529,7 @@ vlc_module_begin ()
     add_shortcut( "skins" )
 
     add_submodule ()
-#ifndef WIN32
-        set_capability( "xwindow", 51 )
-#else
-        set_capability( "hwnd", 51 )
-#endif
+        set_capability( "vout window", 51 )
         set_callbacks( WindowOpen, WindowClose )
 
-    add_submodule ()
-        set_description( N_("Skins loader demux") )
-        set_capability( "demux", 5 )
-        set_callbacks( DemuxOpen, NULL )
-        add_shortcut( "skins" )
-
 vlc_module_end ()