* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.83 2003/05/08 14:15:36 titer 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>
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "error.h"
+#include "vlc_error.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
#include "audio_output.h"
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
#include "libvlc.h"
/*****************************************************************************
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-static libvlc_t libvlc;
-static vlc_t * p_static_vlc;
+static libvlc_t libvlc;
+static libvlc_t * p_libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
#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.
*****************************************************************************
vlc_t * p_vlc = NULL;
vlc_value_t lockval;
+ /* &libvlc never changes, so we can safely call this multiple times. */
+ p_libvlc = &libvlc;
+
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
- i_ret = vlc_threads_init( &libvlc );
+ i_ret = vlc_threads_init( p_libvlc );
if( i_ret < 0 )
{
return i_ret;
/* Now that the thread system is initialized, we don't have much, but
* at least we have var_Create */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !libvlc.b_ready )
{
#endif
/* Initialize message queue */
- msg_Create( &libvlc );
+ msg_Create( p_libvlc );
/* Announce who we are */
- msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+ msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
/* The module bank will be initialized later */
libvlc.p_module_bank = NULL;
libvlc.b_ready = VLC_TRUE;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Allocate a vlc object */
- p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC );
+ p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
if( p_vlc == NULL )
{
return VLC_EGENERIC;
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
+#ifdef SYS_DARWIN
+ vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
+#endif
/* Store our newly allocated structure in the global list */
- vlc_object_attach( p_vlc, &libvlc );
+ vlc_object_attach( p_vlc, p_libvlc );
/* Store data for the non-reentrant API */
p_static_vlc = p_vlc;
char * p_tmp;
char * psz_modules;
char * psz_parser;
- char * psz_translation;
+ 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( &libvlc, i_object ) : p_static_vlc;
-
if( !p_vlc )
{
return VLC_ENOOBJ;
* main module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help == main module
* options) */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( libvlc.p_module_bank == NULL )
{
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
{
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
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 */
{
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
/* 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 );
- psz_translation = config_GetPsz( p_vlc, "translation" );
- if( psz_translation && *psz_translation )
+ /* Check if the user specified a custom language */
+ psz_language = config_GetPsz( p_vlc, "language" );
+ if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
{
/* Reset the default domain */
- SetLanguage( psz_translation );
+ SetLanguage( psz_language );
+
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
textdomain( PACKAGE );
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
+ /* BeOS only support UTF8 strings */
+ /* Mac OS X prefers UTF8 */
+ bind_textdomain_codeset( PACKAGE, "UTF-8" );
+#endif
+
module_EndBank( p_vlc );
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
}
+ if( psz_language ) free( psz_language );
#endif
/*
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( &libvlc );
- module_LoadPlugins( &libvlc );
+ module_LoadBuiltins( p_libvlc );
+ module_LoadPlugins( p_libvlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
libvlc.p_module_bank->i_children );
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 )
{
- //module_EndBank( p_vlc );
+ 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
- //module_EndBank( p_vlc );
+ 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
*/
{
module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
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( &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( &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 !
*/
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
/*
* System specific cleaning code
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
+#ifdef SYS_DARWIN
+ vlc_mutex_destroy( &p_vlc->quicktime_lock );
+#endif
vlc_object_detach( p_vlc );
vlc_object_destroy( p_vlc );
/* Stop thread system: last one out please shut the door! */
- vlc_threads_end( &libvlc );
+ vlc_threads_end( p_libvlc );
return VLC_SUCCESS;
}
*****************************************************************************/
int VLC_Die( int i_object )
{
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
* This function adds psz_target to the current playlist. If a playlist does
* not exist, it will create one.
*****************************************************************************/
-int VLC_AddTarget( int i_object, char const *psz_target, int i_mode, int i_pos )
+int VLC_AddTarget( int i_object, char const *psz_target,
+ char const **ppsz_options, int i_options,
+ int i_mode, int i_pos )
{
int i_err;
playlist_t *p_playlist;
- vlc_t *p_vlc;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
vlc_object_yield( p_playlist );
}
- i_err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ i_err = playlist_Add( p_playlist, psz_target, ppsz_options, i_options,
+ i_mode, i_pos );
vlc_object_release( p_playlist );
*****************************************************************************/
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( &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( &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( &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( &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( &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( &libvlc, i_object ) : p_static_vlc;
+ vlc_t *p_vlc = vlc_current_object( i_object );
if( !p_vlc )
{
char psz_tmp[1024];
#endif
-# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
- if( *psz_lang )
- {
- /* We set LC_ALL manually because it is the only way to set
- * the language at runtime under eg. Windows. Beware that this
- * makes the environment unconsistent when libvlc is unloaded and
- * should probably be moved to a safer place like vlc.c. */
- static char psz_lcall[20];
- snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
- psz_lcall[19] = '\0';
- putenv( psz_lcall );
- }
-# endif
-
if( psz_lang && !*psz_lang )
{
# if defined( HAVE_LC_MESSAGES )
# endif
setlocale( LC_CTYPE, psz_lang );
}
- else
+ else if( psz_lang )
{
-#ifdef SYS_BEOS
- static char psz_lcall[20];
-#endif
- setlocale( LC_ALL, psz_lang );
#ifdef SYS_DARWIN
/* I need that under Darwin, please check it doesn't disturb
* other platforms. --Meuuh */
setenv( "LANG", psz_lang, 1 );
-#endif
-#ifdef SYS_BEOS
- /* I need this under BeOS... */
+
+#elif defined( SYS_BEOS ) || defined( WIN32 )
+ /* We set LC_ALL manually because it is the only way to set
+ * the language at runtime under eg. Windows. Beware that this
+ * makes the environment unconsistent when libvlc is unloaded and
+ * should probably be moved to a safer place like vlc.c. */
+ static char psz_lcall[20];
snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
psz_lcall[19] = '\0';
putenv( psz_lcall );
#endif
+
+ setlocale( LC_ALL, psz_lang );
}
/* Specify where to find the locales for current domain */
/* Set the default domain */
textdomain( PACKAGE );
-#ifdef SYS_BEOS
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
/* BeOS only support UTF8 strings */
+ /* Mac OS X prefers UTF8 */
bind_textdomain_codeset( PACKAGE, "UTF-8" );
#endif
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
- * Parse command line for input files.
+ * Parse command line for input files as well as their associated options.
+ * An option always follows its associated input and begins with a ":".
*****************************************************************************/
static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
{
- int i_opt;
+ int i_opt, i_options;
- /* We assume that the remaining parameters are filenames */
- for( i_opt = i_argc - 1; i_opt > optind; i_opt-- )
+ /* We assume that the remaining parameters are filenames
+ * and their input options */
+ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
{
+ i_options = 0;
+
+ /* Count the input options */
+ while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
+ {
+ i_options++;
+ i_opt--;
+ }
+
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ],
- PLAYLIST_INSERT, 0 );
- }
-
- /* If there is at least one target, play it */
- if( i_argc > optind )
- {
- VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ optind ],
- PLAYLIST_INSERT | PLAYLIST_GO, 0 );
+ (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
+ NULL ), i_options,
+ PLAYLIST_INSERT | (i_opt == optind ? PLAYLIST_GO : 0),
+ 0 );
}
return VLC_SUCCESS;
_("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") );
projects / vlc / blobdiff