* skins2/src/skin_main.cpp: New demux2 module to load automatically a skin.

   This only works when the skins2 interface is active.
   Not very much tested yet...

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index a6cf61bc110a9e9c947ff74307843578198cd341..a79a591f2a3446d688ae4bfc98cd7a0f2432d5f5 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -51,6 +51,10 @@ 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 );
+
 
 //---------------------------------------------------------------------------
 // Open: initialize interface
@@ -94,6 +98,9 @@ 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 );
+
     // Initialize singletons
     if( OSFactory::instance( p_intf ) == NULL )
     {
@@ -122,7 +129,7 @@ static int Open( vlc_object_t *p_this )
     }
     Dialogs::instance( p_intf );
 
-    /* We support play on start */
+    // We support play on start
     p_intf->b_play = VLC_TRUE;
 
     return( VLC_SUCCESS );
@@ -149,7 +156,7 @@ static void Close( vlc_object_t *p_this )
         vlc_object_release( p_intf->p_sys->p_playlist );
     }
 
-   // Unsuscribe to messages bank
+   // Unsubscribe from messages bank
     msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
 
     // Destroy structure
@@ -197,7 +204,8 @@ static void Run( intf_thread_t *p_intf )
                 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...");
+                msg_Err( p_intf,
+                         "Cannot show the \"open skin\" dialog: exiting...");
             }
         }
     }
@@ -236,6 +244,91 @@ static void Run( intf_thread_t *p_intf )
     }
 }
 
+
+//---------------------------------------------------------------------------
+// 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 .tar.gz file, based on the extension
+    // TODO: an actual check of the contents would be better...
+    if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL )
+    {
+        msg_Warn( p_this, "skins2 module discarded (path=%s)",
+                  p_demux->psz_path );
+        return VLC_EGENERIC;
+    }
+
+    // Skip '.'
+    ext++;
+
+    if( strcasecmp( ext, "tar.gz" ) && strcasecmp( ext, "vlt" ) )
+    {
+        msg_Warn( p_this, "skins2 module discarded (unknown extension '%s')",
+                  ext );
+        return VLC_EGENERIC;
+    }
+
+    p_intf = (intf_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INTF,
+                                               FIND_ANYWHERE );
+    if( p_intf != NULL )
+    {
+        // Do nothing is skins2 is not the main interface
+        if( ! strcmp( p_intf->p_module->psz_shortname, "skins2" ) )
+        {
+            playlist_t *p_playlist =
+                (playlist_t *) vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
+                                                FIND_ANYWHERE );
+            if( p_playlist != NULL )
+            {
+                // Make sure the item is deleted afterwards
+                p_playlist->pp_items[p_playlist->i_index]->b_autodeletion =
+                    VLC_TRUE;
+                vlc_object_release( p_playlist );
+            }
+
+            vlc_value_t val;
+            val.psz_string = strdup( p_demux->psz_path );
+            var_Set( p_intf, "skin-to-load", val );
+        }
+        else
+        {
+            msg_Warn( p_this,
+                      "skin could not be loaded (not using skins2 intf)" );
+        }
+        vlc_object_release( p_intf );
+    }
+
+    return VLC_SUCCESS;
+}
+
+
+//---------------------------------------------------------------------------
+// Demux: return EOF
+//---------------------------------------------------------------------------
+static int Demux( demux_t *p_demux )
+{
+    return 0;
+}
+
+
+//---------------------------------------------------------------------------
+// DemuxControl
+//---------------------------------------------------------------------------
+static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
+{
+    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+}
+
+
 //---------------------------------------------------------------------------
 // Module descriptor
 //---------------------------------------------------------------------------
@@ -261,4 +354,10 @@ vlc_module_begin();
     set_capability( "interface", 30 );
     set_callbacks( Open, Close );
     set_program( "svlc" );
+
+    add_submodule();
+        set_description( _("Skins loader demux") );
+        set_capability( "demux2", 5 );
+        set_callbacks( DemuxOpen, NULL );
+
 vlc_module_end();

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 093f87f211d2087731c89182577133b229428215..c102d95ef94b2d32e1d6353574d0030f439e1609 100755 (executable)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -30,6 +30,7 @@
 #include "os_timer.hpp"
 #include "var_manager.hpp"
 #include "../commands/async_queue.hpp"
+#include "../commands/cmd_change_skin.hpp"
 #include "../commands/cmd_quit.hpp"
 #include "../commands/cmd_vars.hpp"
 #include "../utils/var_bool.hpp"
@@ -99,6 +100,8 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
     // Called when a playlist item changed
     var_AddCallback( pIntf->p_sys->p_playlist, "item-change",
                      onItemChange, this );
+    // Called when our skins2 demux wants us to load a new skin
+    var_AddCallback( pIntf, "skin-to-load", onSkinToLoad, this );
 
     // Callbacks for vout requests
     getIntf()->pf_request_window = &getWindow;
@@ -312,6 +315,25 @@ int VlcProc::onPlaylistChange( vlc_object_t *pObj, const char *pVariable,
 }
 
 
+int VlcProc::onSkinToLoad( vlc_object_t *pObj, const char *pVariable,
+                           vlc_value_t oldVal, vlc_value_t newVal,
+                           void *pParam )
+{
+    VlcProc *pThis = ( VlcProc* )pParam;
+
+    // Create a playlist notify command
+    CmdChangeSkin *pCmd =
+        new CmdChangeSkin( pThis->getIntf(), newVal.psz_string );
+
+    // Push the command in the asynchronous command queue
+    AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+    pQueue->remove( "change skin" );
+    pQueue->push( CmdGenericPtr( pCmd ) );
+
+    return VLC_SUCCESS;
+}
+
+
 void *VlcProc::getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
                           int *pXHint, int *pYHint,
                           unsigned int *pWidthHint,

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index 974a2def8a2c73d2422252b99e9259f821c81736..d3c7d91e28b80d52174f7c6d30eb68a525016601 100755 (executable)
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -131,6 +131,11 @@ class VlcProc: public SkinObject
                                      vlc_value_t oldVal, vlc_value_t newVal,
                                      void *pParam );
 
+        /// Callback for skins2-to-load variable
+        static int onSkinToLoad( vlc_object_t *pObj, const char *pVariable,
+                                 vlc_value_t oldVal, vlc_value_t newVal,
+                                 void *pParam );
+
         /// Callback to request a vout window
         static void *getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
                                 int *pXHint, int *pYHint,