* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.94 2003/07/23 01:13:48 gbazin Exp $
+ * $Id: libvlc.c,v 1.102 2003/11/23 18:31:55 alexis Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#endif
static int ConsoleWidth ( void );
+
+/*****************************************************************************
+ * vlc_current_object: return the current object.
+ *****************************************************************************
+ * If i_object is non-zero, return the corresponding object. Otherwise,
+ * return the statically allocated p_vlc object.
+ *****************************************************************************/
+vlc_t * vlc_current_object( int i_object )
+{
+ if( i_object )
+ {
+ return vlc_object_get( p_libvlc, i_object );
+ }
+
+ return p_static_vlc;
+}
+
/*****************************************************************************
* VLC_Version: return the libvlc version.
*****************************************************************************
char * psz_parser;
char * psz_language;
vlc_bool_t b_exit = VLC_FALSE;
- vlc_t * p_vlc;
+ vlc_t * p_vlc = vlc_current_object( i_object );
module_t *p_help_module;
playlist_t *p_playlist;
vlc_value_t lockval;
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
b_exit = VLC_TRUE;
}
+ /* Set the config file stuff */
+ p_vlc->psz_homedir = config_GetHomeDir();
+ p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" );
+
/* Hack: remove the help module here */
vlc_object_detach( p_help_module );
/* End hack */
/* This ain't really nice to have to reload the config here but it seems
* the only way to do it. */
- p_vlc->psz_homedir = config_GetHomeDir();
config_LoadConfigFile( p_vlc, "main" );
config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
b_exit = VLC_TRUE;
}
+ /* Check for config file options */
+ if( config_GetInt( p_vlc, "reset-config" ) )
+ {
+ vlc_object_detach( p_help_module );
+ config_ResetAll( p_vlc );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_vlc, NULL );
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ }
+ if( config_GetInt( p_vlc, "save-config" ) )
+ {
+ vlc_object_detach( p_help_module );
+ config_LoadConfigFile( p_vlc, NULL );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_vlc, NULL );
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ }
+
/* Hack: remove the help module here */
vlc_object_detach( p_help_module );
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
/* End hack */
if( b_exit )
{
+ config_Free( p_help_module );
+ vlc_object_destroy( p_help_module );
/*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
/*
* Override default configuration with config file settings
*/
- p_vlc->psz_homedir = config_GetHomeDir();
config_LoadConfigFile( p_vlc, NULL );
+ /* Hack: insert the help module here */
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ /* End hack */
+
/*
* Override configuration with command line settings
*/
"that they are valid.\nPress the RETURN key to continue..." );
getchar();
#endif
+ vlc_object_detach( p_help_module );
+ config_Free( p_help_module );
+ vlc_object_destroy( p_help_module );
/*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
+ /* Hack: remove the help module here */
+ vlc_object_detach( p_help_module );
+ config_Free( p_help_module );
+ vlc_object_destroy( p_help_module );
+ /* End hack */
+
/*
* System specific configuration
*/
- system_Configure( p_vlc );
+ system_Configure( p_vlc, &i_argc, ppsz_argv );
/*
* Message queue options
msg_Flush( p_vlc );
/* p_vlc initialization. FIXME ? */
- p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
#if defined( __i386__ )
if( !config_GetInt( p_vlc, "mmx" ) )
p_vlc->pf_memset = memset;
}
+ /*
+ * Initialize hotkey handling
+ */
+ var_Create( p_vlc, "key-pressed", VLC_VAR_INTEGER );
+ p_vlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
+ /* Do a copy (we don't need to modify the strings) */
+ p_vlc->p_hotkeys = p_hotkeys;
+
/*
* Initialize playlist and get commandline files
*/
free( psz_modules );
}
+ /*
+ * Allways load the hotkeys interface if it exists
+ */
+ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE );
+
/*
* FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
*/
var_Create( p_vlc, "drawable", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableredraw", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablet", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablel", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableb", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawabler", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablex", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawabley", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablew", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableh", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER );
/*
* Get input filenames given as commandline arguments
{
int i_err;
intf_thread_t *p_intf;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
*****************************************************************************/
int VLC_Destroy( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
p_vlc->psz_homedir = NULL;
}
+ if( p_vlc->psz_configfile )
+ {
+ free( p_vlc->psz_configfile );
+ p_vlc->psz_configfile = NULL;
+ }
+
/*
* XXX: Free module bank !
*/
*****************************************************************************/
int VLC_Die( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
{
int i_err;
playlist_t *p_playlist;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
*****************************************************************************/
int VLC_Set( int i_object, char const *psz_var, vlc_value_t value )
{
- vlc_t *p_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
int i_ret;
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
*****************************************************************************/
int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value )
{
- vlc_t *p_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
int i_ret;
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
int VLC_Play( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
playlist_t * p_playlist;
vout_thread_t * p_vout;
aout_instance_t * p_aout;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
if( !p_vlc )
* Ask the interfaces to stop and destroy them
*/
msg_Dbg( p_vlc, "removing all interfaces" );
+
while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
intf_StopThread( p_intf );
/*
* Free playlists
*/
+
msg_Dbg( p_vlc, "removing all playlists" );
while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
FIND_CHILD )) )
vlc_object_release( p_playlist );
playlist_Destroy( p_playlist );
}
-
+
/*
* Free video outputs
*/
int VLC_Pause( int i_object )
{
input_thread_t *p_input;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
int VLC_FullScreen( int i_object )
{
vout_thread_t *p_vout;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
_("This program comes with NO WARRANTY, to the extent permitted by "
"law.\nYou may redistribute it under the terms of the GNU General "
"Public License;\nsee the file named COPYING for details.\n"
- "Written by the VideoLAN team at Ecole Centrale, Paris.\n") );
+ "Written by the VideoLAN team; see AUTHORS file.\n") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") );