/*****************************************************************************
* skin_main.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.4 2004/01/25 17:20:19 kuehne Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
-#include "generic_window.hpp"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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 "dialogs.hpp"
#include "os_factory.hpp"
#include "os_loop.hpp"
-#include "window_manager.hpp"
#include "var_manager.hpp"
#include "vlcproc.hpp"
-#include "theme.hpp"
#include "theme_loader.hpp"
+#include "theme.hpp"
+#include "theme_repository.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.
//---------------------------------------------------------------------------
-// Local prototypes.
+// 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 struct
+{
+ intf_thread_t *intf;
+ vlc_mutex_t mutex;
+} skin_load = { NULL, VLC_STATIC_MUTEX };
//---------------------------------------------------------------------------
// Open: initialize interface
// Allocate instance and initialize some members
p_intf->p_sys = (intf_sys_t *) malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
- {
- msg_Err( p_intf, "out of memory" );
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
p_intf->p_sys->p_input = NULL;
- p_intf->p_sys->p_playlist = (playlist_t *)vlc_object_find( p_intf,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_intf->p_sys->p_playlist == NULL )
- {
- msg_Err( p_intf, "No playlist object found" );
- return VLC_EGENERIC;
- }
+ p_intf->p_sys->p_playlist = pl_Hold( p_intf );
// Initialize "singleton" objects
p_intf->p_sys->p_logger = NULL;
p_intf->p_sys->p_osLoop = NULL;
p_intf->p_sys->p_varManager = NULL;
p_intf->p_sys->p_vlcProc = NULL;
+ p_intf->p_sys->p_repository = NULL;
// 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 )
{
- msg_Err( p_intf, "Cannot initialize OSFactory" );
+ msg_Err( p_intf, "cannot initialize OSFactory" );
+ vlc_object_release( p_intf->p_sys->p_playlist );
+#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" );
+ msg_Err( p_intf, "cannot initialize AsyncQueue" );
+ vlc_object_release( p_intf->p_sys->p_playlist );
+#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" );
+ msg_Err( p_intf, "cannot instanciate Interpreter" );
+ vlc_object_release( p_intf->p_sys->p_playlist );
+#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" );
+ msg_Err( p_intf, "cannot instanciate VarManager" );
+ vlc_object_release( p_intf->p_sys->p_playlist );
+#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" );
+ msg_Err( p_intf, "cannot initialize VLCProc" );
+ vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
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 );
+
+ if( !skin_last || !*skin_last || !pLoader->load( skin_last ) )
+ {
+ // 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();
+
+ 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;
+
+ free( skin_last );
+
+#ifdef WIN32
+ p_intf->b_should_run_on_first_thread = true;
+#endif
return( VLC_SUCCESS );
}
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ vlc_mutex_lock( &skin_load.mutex );
+ skin_load.intf = NULL;
+ vlc_mutex_unlock( &skin_load.mutex);
+
// Destroy "singleton" objects
- VlcProc::destroy( p_intf );
OSFactory::instance( p_intf )->destroyOSLoop();
- OSFactory::destroy( p_intf );
+ ThemeRepository::destroy( p_intf );
Dialogs::destroy( p_intf );
Interpreter::destroy( p_intf );
AsyncQueue::destroy( p_intf );
VarManager::destroy( p_intf );
-
- if( p_intf->p_sys->p_input )
- {
- vlc_object_release( p_intf->p_sys->p_input );
- }
+ VlcProc::destroy( p_intf );
+ OSFactory::destroy( p_intf );
if( p_intf->p_sys->p_playlist )
{
vlc_object_release( p_intf->p_sys->p_playlist );
}
- // Unsuscribe to messages bank
+ // Unsubscribe from messages bank
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
// Destroy structure
free( p_intf->p_sys );
//---------------------------------------------------------------------------
static void Run( intf_thread_t *p_intf )
{
- // Load a theme
- ThemeLoader *pLoader = new ThemeLoader( p_intf );
- char *skin_last = config_GetPsz( p_intf, "skin_last2" );
-
- if( skin_last == NULL || !pLoader->load( skin_last ) )
- {
- // Too bad, it failed. Let's try with the default theme
-#ifdef WIN32_SKINS
- string default_dir = (string)p_intf->p_libvlc->psz_vlcpath +
- "\\skins\\default\\theme.xml";
- if( !pLoader->load( default_dir ) )
-#else
- string user_skin = (string)p_intf->p_vlc->psz_homedir +
- "/" + CONFIG_DIR + "/skins/default/theme.xml";
-
- string default_skin = (string)DATA_PATH + "/skins/default/theme.xml";
- if( !pLoader->load( user_skin ) && !pLoader->load( default_skin ) )
-#endif
- {
- // Last chance: the user can select a new theme file (blocking call)
- Dialogs *pDialogs = Dialogs::instance( p_intf );
- pDialogs->showChangeSkin();
- }
- }
- delete pLoader;
-
- if( skin_last )
- {
- free( skin_last );
- }
+ int canc = vlc_savecancel();
// Get the instance of OSLoop
OSLoop *loop = OSFactory::instance( p_intf )->getOSLoop();
+
+ // Enter the main event loop
loop->run();
- // Delete the theme
+ // Delete the theme and save the configuration of the windows
if( p_intf->p_sys->p_theme )
{
+ p_intf->p_sys->p_theme->saveConfig();
delete p_intf->p_sys->p_theme;
p_intf->p_sys->p_theme = NULL;
}
+ vlc_restorecancel(canc);
+}
+
+
+// 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 );
+
+ if( pIntf == NULL )
+ return VLC_EGENERIC;
+
+ /* FIXME: most probably not thread-safe,
+ * albeit no worse than ever before */
+ pWnd->handle = VlcProc::getWindow( pIntf, pWnd->vout,
+ &pWnd->pos_x, &pWnd->pos_y,
+ &pWnd->width, &pWnd->height );
+ pWnd->p_private = pIntf;
+ pWnd->control = &VlcProc::controlWindow;
+ return VLC_SUCCESS;
+}
+
+
+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;
+
+ VlcProc::releaseWindow( pIntf, pWnd->handle );
+}
+
+//---------------------------------------------------------------------------
+// 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;
+ }
+
+ 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 );
+
+ 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;
+ vlc_object_release( p_playlist );
+
+ var_SetString( p_intf, "skin-to-load", p_demux->psz_path );
+ vlc_object_release( p_intf );
+ }
+ else
+ {
+ msg_Warn( p_this,
+ "skin could not be loaded (not using skins2 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 demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+}
+
+
+//---------------------------------------------------------------------------
+// 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 )
+{
+ intf_thread_t *pIntf;
+
+ vlc_mutex_lock( &skin_load.mutex );
+ pIntf = skin_load.intf;
+ if( pIntf )
+ vlc_object_hold( pIntf );
+ vlc_mutex_unlock( &skin_load.mutex );
+
+ if( pIntf == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+
+ AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
+ if( newVal.b_bool )
+ {
+ CmdAddInTray *pCmd = new CmdAddInTray( pIntf );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+ else
+ {
+ CmdRemoveFromTray *pCmd = new CmdRemoveFromTray( pIntf );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+
+ 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 )
+{
+ intf_thread_t *pIntf;
+
+ vlc_mutex_lock( &skin_load.mutex );
+ pIntf = skin_load.intf;
+ if( pIntf )
+ vlc_object_hold( pIntf );
+ vlc_mutex_unlock( &skin_load.mutex );
+
+ if( pIntf == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+
+ AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
+ if( newVal.b_bool )
+ {
+ CmdAddInTaskBar *pCmd = new CmdAddInTaskBar( pIntf );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+ else
+ {
+ CmdRemoveFromTaskBar *pCmd = new CmdRemoveFromTaskBar( pIntf );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+
+ vlc_object_release( pIntf );
+ return VLC_SUCCESS;
+}
+
+
//---------------------------------------------------------------------------
// Module descriptor
//---------------------------------------------------------------------------
-#define DEFAULT_SKIN N_("Last skin used")
-#define DEFAULT_SKIN_LONG N_("Select the path to the last skin used.")
+#define SKINS2_LAST N_("Skin to use")
+#define SKINS2_LAST_LONG N_("Path to the skin to use.")
+#define SKINS2_CONFIG N_("Config of last used skin")
+#define SKINS2_CONFIG_LONG N_("Windows configuration of the last skin used. " \
+ "This option is updated automatically, do not touch it." )
+#define SKINS2_SYSTRAY N_("Systray icon")
+#define SKINS2_SYSTRAY_LONG N_("Show a systray icon for VLC")
+#define SKINS2_TASKBAR N_("Show VLC on the taskbar")
+#define SKINS2_TASKBAR_LONG N_("Show VLC on the taskbar")
+#define SKINS2_TRANSPARENCY N_("Enable transparency effects")
+#define SKINS2_TRANSPARENCY_LONG N_("You can disable all transparency effects"\
+ " if you want. This is mainly useful when moving windows does not behave" \
+ " correctly.")
+#define SKINS2_PLAYLIST N_("Use a skinned playlist")
+#define SKINS2_PLAYLIST_LONG N_("Use a skinned playlist")
+
+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,
+ true )
+ change_autosave ()
+ change_internal ()
+#ifdef WIN32
+ add_bool( "skins2-systray", false, onSystrayChange, SKINS2_SYSTRAY,
+ SKINS2_SYSTRAY_LONG, false );
+ add_bool( "skins2-taskbar", true, onTaskBarChange, SKINS2_TASKBAR,
+ SKINS2_TASKBAR_LONG, false );
+ add_bool( "skins2-transparency", false, NULL, SKINS2_TRANSPARENCY,
+ SKINS2_TRANSPARENCY_LONG, false );
+#endif
+
+ add_bool( "skinned-playlist", true, NULL, SKINS2_PLAYLIST,
+ SKINS2_PLAYLIST_LONG, false );
+ set_shortname( N_("Skins"))
+ set_description( N_("Skinnable Interface") )
+ set_capability( "interface", 30 )
+ set_callbacks( Open, Close )
+ add_shortcut( "skins" )
+
+ add_submodule ()
+ set_capability( "vout_window", 51 )
+ set_callbacks( WindowOpen, WindowClose )
-vlc_module_begin();
-// XXX
- add_string( "skin_last2", "", NULL, DEFAULT_SKIN, DEFAULT_SKIN_LONG,
- VLC_TRUE );
- set_description( _("Skinnable Interface") );
- set_capability( "interface", 30 );
- set_callbacks( Open, Close );
- set_program( "svlc" );
-vlc_module_end();
+ add_submodule ()
+ set_description( N_("Skins loader demux") )
+ set_capability( "demux", 5 )
+ set_callbacks( DemuxOpen, NULL )
+vlc_module_end ()
projects / vlc / blobdiff