/*****************************************************************************
* skin_main.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * 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 <vlc/input.h>
+#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 "dialogs.hpp"
#include "os_factory.hpp"
#include "os_loop.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 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 );
+
//---------------------------------------------------------------------------
// Open: initialize interface
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
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_Yield( p_intf );
// Initialize "singleton" objects
p_intf->p_sys->p_logger = NULL;
// 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 );
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
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 );
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
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 );
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
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 );
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
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 );
+ msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
return VLC_EGENERIC;
}
Dialogs::instance( p_intf );
ThemeRepository::instance( p_intf );
- // We support play on start
- p_intf->b_play = VLC_TRUE;
-
return( VLC_SUCCESS );
}
vlc_object_release( p_intf->p_sys->p_playlist );
}
- // Unsubscribe from messages bank
+ // Unsubscribe from messages bank
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
// Destroy structure
if( it == resPath.end() )
{
// Last chance: the user can select a new theme file
- Dialogs *pDialogs = Dialogs::instance( p_intf );
- if( pDialogs )
+ if( Dialogs::instance( p_intf ) )
{
- pDialogs->showChangeSkin();
+ CmdDlgChangeSkin *pCmd = new CmdDlgChangeSkin( p_intf );
+ AsyncQueue *pQueue = AsyncQueue::instance( p_intf );
+ pQueue->push( CmdGenericPtr( pCmd ) );
}
else
{
AsyncQueue *pQueue = AsyncQueue::instance( p_intf );
pQueue->push( CmdGenericPtr( pCmd ) );
msg_Err( p_intf,
- "Cannot show the \"open skin\" dialog: exiting...");
+ "cannot show the \"open skin\" dialog: exiting...");
}
}
}
delete pLoader;
- if( skin_last )
- {
- free( skin_last );
- }
+ free( skin_last );
// Get the instance of OSLoop
OSLoop *loop = OSFactory::instance( p_intf )->getOSLoop();
- // Check if we need to start playing
- if( p_intf->b_play )
- {
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- }
- }
-
// Enter the main event loop
loop->run();
p_demux->pf_demux = Demux;
p_demux->pf_control = DemuxControl;
- // Test that we have a valid .vlt file, based on the extension
+ // 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, ".vlt" ) && strcasecmp( ext, ".wsz" ) ) )
{
return VLC_EGENERIC;
}
// Do nothing is skins2 is not the main interface
if( var_Type( p_intf, "skin-to-load" ) == VLC_VAR_STRING )
{
- 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 );
- }
+ playlist_t *p_playlist = pl_Yield( p_this );
+ // Make sure the item is deleted afterwards
+ /// \bug does not always work
+ p_playlist->status.p_item->i_flags |= PLAYLIST_REMOVE_FLAG;
+ vlc_object_release( p_playlist );
vlc_value_t val;
val.psz_string = p_demux->psz_path;
//---------------------------------------------------------------------------
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 );
+ 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 =
+ (intf_thread_t*)vlc_object_find( pObj, VLC_OBJECT_INTF, FIND_ANYWHERE );
+
+ if( pIntf == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+
+ // Check that we found the correct interface (same check as for the demux)
+ if( var_Type( pIntf, "skin-to-load" ) == VLC_VAR_STRING )
+ {
+ 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 =
+ (intf_thread_t*)vlc_object_find( pObj, VLC_OBJECT_INTF, FIND_ANYWHERE );
+
+ if( pIntf == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+
+ // Check that we found the correct interface (same check as for the demux)
+ if( var_Type( pIntf, "skin-to-load" ) == VLC_VAR_STRING )
+ {
+ 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 SKINS2_LAST N_("Last skin used")
-#define SKINS2_LAST_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_("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();
- add_string( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG,
- VLC_TRUE );
+ 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,
- VLC_TRUE );
+ true );
+ change_autosave();
+ change_internal();
#ifdef WIN32
- add_bool( "skins2-transparency", VLC_FALSE, NULL, SKINS2_TRANSPARENCY,
- SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
+ 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
- set_description( _("Skinnable Interface") );
+ 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" );
- set_program( "svlc" );
add_submodule();
- set_description( _("Skins loader demux") );
- set_capability( "demux2", 5 );
+ set_description( N_("Skins loader demux") );
+ set_capability( "demux", 5 );
set_callbacks( DemuxOpen, NULL );
vlc_module_end();
projects / vlc / blobdiff