* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.54 2002/12/25 23:39:01 sam Exp $
+ * $Id: libvlc.c,v 1.105 2003/12/04 16:49:45 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "error.h"
-#include "netutils.h" /* network_ChannelJoin */
+#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
#ifdef WIN32
static void ShowConsole ( void );
#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 )
{
psz_env = getenv( "VLC_VERBOSE" );
libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
-#ifdef HAVE_ISATTY
+#if defined( HAVE_ISATTY ) && !defined( WIN32 )
libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
#else
libvlc.b_color = VLC_FALSE;
#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 );
- /* Initialize the module bank and load the configuration of the
- * 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) */
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ /* 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;
}
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
/* 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_capabilities[200];
char * p_tmp;
- vlc_bool_t b_exit;
- vlc_t * p_vlc;
+ char * psz_modules;
+ char * psz_parser;
+ char * psz_language;
+ vlc_bool_t b_exit = VLC_FALSE;
+ vlc_t * p_vlc = vlc_current_object( i_object );
module_t *p_help_module;
playlist_t *p_playlist;
-
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ vlc_value_t lockval;
if( !p_vlc )
{
return VLC_ENOOBJ;
}
- /*
- * Support for gettext
- */
- SetLanguage( "" );
- msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
-
/*
* System specific initialization code
*/
p_vlc->psz_object_name = "vlc";
}
+ /*
+ * Support for gettext
+ */
+ SetLanguage( "" );
+
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+
+ /* Initialize the module bank and load the configuration of the
+ * 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( 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( p_vlc );
+ module_LoadMain( p_vlc );
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ 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_FALSE;
-
/* Check for short help option */
if( config_GetInt( p_vlc, "help" ) )
{
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;
}
+ /* Check for translation config option */
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+ /* This ain't really nice to have to reload the config here but it seems
+ * the only way to do it. */
+ config_LoadConfigFile( p_vlc, "main" );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+
+ /* 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_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( p_vlc );
+ module_LoadMain( p_vlc );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ }
+ if( psz_language ) free( psz_language );
+#endif
+
/*
* Load the builtins and plugins into the module_bank.
* We have to do it before config_Load*() because this also gets the
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( &libvlc );
- module_LoadPlugins( &libvlc );
+ module_LoadBuiltins( p_vlc );
+ module_LoadPlugins( p_vlc );
+ if( p_vlc->b_die )
+ {
+ b_exit = VLC_TRUE;
+ }
+
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
libvlc.i_verbose = __MIN( i_tmp, 2 );
}
}
- libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" );
+ libvlc.b_color = libvlc.b_color && config_GetInt( p_vlc, "color" );
/*
* Output messages that may still be in the queue
*/
msg_Flush( p_vlc );
- /* p_vlc inititalization. FIXME ? */
- p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
+ /* p_vlc initialization. FIXME ? */
#if defined( __i386__ )
if( !config_GetInt( p_vlc, "mmx" ) )
}
/*
- * Initialize shared resources and libraries
+ * Initialize hotkey handling
*/
- if( config_GetInt( p_vlc, "network-channel" )
- && network_ChannelCreate( p_vlc ) )
- {
- /* On error during Channels initialization, switch off channels */
- msg_Warn( p_vlc,
- "channels initialization failed, deactivating channels" );
- config_PutInt( p_vlc, "network-channel", VLC_FALSE );
- }
+ 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) */
+ memcpy( p_vlc->p_hotkeys, p_hotkeys, sizeof(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;
}
+ /*
+ * Load background interfaces
+ */
+ psz_modules = config_GetPsz( p_vlc, "extraintf" );
+ psz_parser = psz_modules;
+ while ( psz_parser && *psz_parser )
+ {
+ char *psz_module, *psz_temp;
+ psz_module = psz_parser;
+ psz_parser = strchr( psz_module, ',' );
+ if ( psz_parser )
+ {
+ *psz_parser = '\0';
+ psz_parser++;
+ }
+ psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
+ if( psz_temp )
+ {
+ sprintf( psz_temp, "%s,none", psz_module );
+ VLC_AddIntf( 0, psz_temp, VLC_FALSE );
+ free( psz_temp );
+ }
+ }
+ if ( psz_modules )
+ {
+ 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;
- char *psz_oldmodule = NULL;
-
- 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 )
{
return VLC_ENOOBJ;
}
- if( psz_module )
- {
- psz_oldmodule = config_GetPsz( p_vlc, "intf" );
- config_PutPsz( p_vlc, "intf", psz_module );
- }
-
/* Try to create the interface */
- p_intf = intf_Create( p_vlc );
-
- if( psz_module )
- {
- config_PutPsz( p_vlc, "intf", psz_oldmodule );
- if( psz_oldmodule )
- {
- free( psz_oldmodule );
- }
- }
+ p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf" );
if( p_intf == NULL )
{
- msg_Err( p_vlc, "interface initialization failed" );
+ msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
*****************************************************************************/
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 )
{
return VLC_ENOOBJ;
}
- /*
- * Go back into channel 0 which is the network
- */
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
- {
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
- }
-
/*
* Free allocated memory
*/
p_vlc->psz_homedir = NULL;
}
+ if( p_vlc->psz_configfile )
+ {
+ free( p_vlc->psz_configfile );
+ p_vlc->psz_configfile = NULL;
+ }
+
+ if( p_vlc->p_hotkeys )
+ {
+ free( p_vlc->p_hotkeys );
+ p_vlc->p_hotkeys = NULL;
+ }
+
/*
* XXX: Free module bank !
*/
- //module_EndBank( p_vlc );
-
+ /*module_EndBank( p_vlc );*/
+
/*
* System specific cleaning code
*/
system_End( p_vlc );
-
+
/* 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 );
+ /* Release object before destroying it */
+ if( i_object ) vlc_object_release( 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 );
- if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
* VLC_Die: ask vlc to die.
*****************************************************************************
* This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
- * task. It is your duty to call vlc_end and VLC_Destroy afterwards.
+ * task. It is your duty to call VLC_End and VLC_Destroy afterwards.
*****************************************************************************/
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 )
{
return VLC_ENOOBJ;
}
-
- /* add pseudo sap interface; non blocking */
- if( config_GetInt( p_vlc, "sap" ) )
- {
- msg_Dbg( p_vlc, "adding sap interface" );
- VLC_AddIntf( 0, "sap", VLC_FALSE );
- }
-
- vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
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 )
{
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
- if( *psz_lang )
+ char * psz_path;
+#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS )
+ char psz_tmp[1024];
+#endif
+
+ if( psz_lang && !*psz_lang )
+ {
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
+ }
+ else if( psz_lang )
{
+#ifdef SYS_DARWIN
+ /* I need that under Darwin, please check it doesn't disturb
+ * other platforms. --Meuuh */
+ setenv( "LANG", psz_lang, 1 );
+
+#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
snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
psz_lcall[19] = '\0';
putenv( psz_lcall );
- }
-# endif
+#endif
-# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, psz_lang );
-# endif
- setlocale( LC_CTYPE, psz_lang );
+ setlocale( LC_ALL, psz_lang );
+ }
/* Specify where to find the locales for current domain */
- if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
+#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS )
+ psz_path = LOCALEDIR;
+#else
+ snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
+ "locale" );
+ psz_path = psz_tmp;
+#endif
+ if( !bindtextdomain( PACKAGE, psz_path ) )
{
fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, LOCALEDIR );
+ PACKAGE, psz_path );
}
/* Set the default domain */
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
+
#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;
*****************************************************************************/
static void Usage( vlc_t *p_this, char const *psz_module_name )
{
-#define FORMAT_STRING " --%s%s%s%s%s%s%s %s%s\n"
- /* option name -------------' | | | | | |
- * <bra --------------------------' | | | | |
- * option type or "" ---------------' | | | |
- * ket> ------------------------------' | | |
- * padding spaces ----------------------' | |
- * comment --------------------------------' |
- * comment suffix ---------------------------'
+#define FORMAT_STRING " %s --%s%s%s%s%s%s%s "
+ /* short option ------' | | | | | | |
+ * option name ------------' | | | | | |
+ * <bra -------------------------' | | | | |
+ * option type or "" --------------' | | | |
+ * ket> -----------------------------' | | |
+ * padding spaces ---------------------' | |
+ * comment -------------------------------' |
+ * comment suffix --------------------------'
*
* The purpose of having bra and ket is that we might i18n them as well.
*/
#define LINE_START 8
#define PADDING_SPACES 25
- vlc_list_t list;
+ vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
char psz_spaces[PADDING_SPACES+LINE_START+1];
char psz_format[sizeof(FORMAT_STRING)];
+ char psz_buffer[1000];
+ char psz_short[4];
int i_index;
+ int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
psz_spaces[PADDING_SPACES+LINE_START] = '\0';
#endif
/* List all modules */
- list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate the config for each module */
- for( i_index = 0; i_index < list.i_count; i_index++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
vlc_bool_t b_help_module;
- p_parser = (module_t *)list.p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
+ char *psz_text;
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
char *psz_suf = "", *psz_prefix = NULL;
int i;
-
+ if ( p_item->b_advanced && !config_GetInt( p_this, "advanced" ))
+ {
+ continue;
+ }
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
}
else
{
- psz_bra = " [";
- psz_type = malloc( 1000 );
- memset( psz_type, 0, 1000 );
- for( i=0; p_item->ppsz_list[i]; i++ )
+ psz_bra = " {";
+ psz_type = psz_buffer;
+ psz_type[0] = '\0';
+ for( i = 0; p_item->ppsz_list[i]; i++ )
{
+ if( i ) strcat( psz_type, "," );
strcat( psz_type, p_item->ppsz_list[i] );
- strcat( psz_type, "|" );
}
- psz_type[ strlen( psz_type ) - 1 ] = '\0';
- psz_ket = "]";
+ psz_ket = "}";
break;
}
case CONFIG_ITEM_INTEGER:
break;
}
+ if( !psz_type )
+ {
+ continue;
+ }
+
/* Add short option if any */
if( p_item->i_short )
{
- psz_format[2] = '-';
- psz_format[3] = p_item->i_short;
- psz_format[4] = ',';
+ sprintf( psz_short, "-%c,", p_item->i_short );
}
else
{
- psz_format[2] = ' ';
- psz_format[3] = ' ';
- psz_format[4] = ' ';
+ strcpy( psz_short, " " );
}
- if( psz_type )
+ i = PADDING_SPACES - strlen( p_item->psz_name )
+ - strlen( psz_bra ) - strlen( psz_type )
+ - strlen( psz_ket ) - 1;
+
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
{
- i = PADDING_SPACES - strlen( p_item->psz_name )
- - strlen( psz_bra ) - strlen( psz_type )
- - strlen( psz_ket ) - 1;
- if( p_item->i_type == CONFIG_ITEM_BOOL
- && !b_help_module )
- {
- /* If option is of type --foo-bar, we print its counterpart
- * as --no-foo-bar, but if it is of type --foobar (without
- * dashes in the name) we print it as --nofoobar. Both
- * values are of course valid, only the display changes. */
- vlc_bool_t b_dash = VLC_FALSE;
- psz_prefix = p_item->psz_name;
- while( *psz_prefix )
- {
- if( *psz_prefix++ == '-' )
- {
- b_dash = VLC_TRUE;
- break;
- }
- }
+ /* If option is of type --foo-bar, we print its counterpart
+ * as --no-foo-bar, but if it is of type --foobar (without
+ * dashes in the name) we print it as --nofoobar. Both
+ * values are of course valid, only the display changes. */
+ psz_prefix = strchr( p_item->psz_name, '-' ) ? ", --no-"
+ : ", --no";
+ i -= strlen( p_item->psz_name ) + strlen( psz_prefix );
+ }
- if( b_dash )
- {
- psz_prefix = ", --no-";
- i -= strlen( p_item->psz_name ) + strlen( ", --no-" );
- }
- else
- {
- psz_prefix = ", --no";
- i -= strlen( p_item->psz_name ) + strlen( ", --no" );
- }
- }
+ if( i < 0 )
+ {
+ psz_spaces[0] = '\n';
+ i = 0;
+ }
+ else
+ {
+ psz_spaces[i] = '\0';
+ }
- if( i < 0 )
- {
- i = 0;
- psz_spaces[i] = '\n';
- }
- else
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+ {
+ fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+ psz_prefix, p_item->psz_name, psz_bra, psz_type,
+ psz_ket, psz_spaces );
+ }
+ else
+ {
+ fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+ "", "", psz_bra, psz_type, psz_ket, psz_spaces );
+ }
+
+ psz_spaces[i] = ' ';
+
+ /* We wrap the rest of the output */
+ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ psz_text = psz_buffer;
+ while( *psz_text )
+ {
+ char *psz_parser, *psz_word;
+ int i_end = strlen( psz_text );
+
+ /* If the remaining text fits in a line, print it. */
+ if( i_end <= i_width )
{
- psz_spaces[i] = '\0';
+ fprintf( stdout, "%s\n", psz_text );
+ break;
}
- if( p_item->i_type == CONFIG_ITEM_BOOL &&
- !b_help_module )
+ /* Otherwise, eat as many words as possible */
+ psz_parser = psz_text;
+ do
{
- fprintf( stdout, psz_format, p_item->psz_name, psz_prefix,
- p_item->psz_name, psz_bra, psz_type, psz_ket,
- psz_spaces, p_item->psz_text, psz_suf );
- }
- else
+ psz_word = psz_parser;
+ psz_parser = strchr( psz_word, ' ' );
+ /* If no space was found, we reached the end of the text
+ * block; otherwise, we skip the space we just found. */
+ psz_parser = psz_parser ? psz_parser + 1
+ : psz_text + i_end;
+
+ } while( psz_parser - psz_text <= i_width );
+
+ /* We cut a word in one of these cases:
+ * - it's the only word in the line and it's too long.
+ * - we used less than 80% of the width and the word we are
+ * going to wrap is longer than 40% of the width, and even
+ * if the word would have fit in the next line. */
+ if( psz_word == psz_text
+ || ( psz_word - psz_text < 80 * i_width / 100
+ && psz_parser - psz_word > 40 * i_width / 100 ) )
{
- fprintf( stdout, psz_format, p_item->psz_name, "", "",
- psz_bra, psz_type, psz_ket, psz_spaces,
- p_item->psz_text, psz_suf );
+ char c = psz_text[i_width];
+ psz_text[i_width] = '\0';
+ fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ psz_text += i_width;
+ psz_text[0] = c;
}
- psz_spaces[i] = ' ';
- if ( p_item->ppsz_list )
+ else
{
- free( psz_type );
+ psz_word[-1] = '\0';
+ fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ psz_text = psz_word;
}
}
}
}
/* Release the module list */
- vlc_list_release( &list );
+ vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
#endif
}
*****************************************************************************/
static void ListModules( vlc_t *p_this )
{
- vlc_list_t list;
+ vlc_list_t *p_list;
module_t *p_parser;
char psz_spaces[22];
int i_index;
fprintf( stdout, _("[module] [description]\n") );
/* List all modules */
- list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( i_index = 0; i_index < list.i_count; i_index++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
int i;
- p_parser = (module_t *)list.p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
/* Nasty hack, but right now I'm too tired to think about a nice
* solution */
psz_spaces[i] = ' ';
}
- vlc_list_release( &list );
+ vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
#endif
}
_("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 the AUTHORS file.\n") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
return;
}
#endif
+
+/*****************************************************************************
+ * ConsoleWidth: Return the console width in characters
+ *****************************************************************************
+ * We use the stty shell command to get the console width; if this fails or
+ * if the width is less than 80, we default to 80.
+ *****************************************************************************/
+static int ConsoleWidth( void )
+{
+ int i_width = 80;
+
+#ifndef WIN32
+ char buf[20], *psz_parser;
+ FILE *file;
+ int i_ret;
+
+ file = popen( "stty size 2>/dev/null", "r" );
+ if( file )
+ {
+ i_ret = fread( buf, 1, 20, file );
+ if( i_ret > 0 )
+ {
+ buf[19] = '\0';
+ psz_parser = strchr( buf, ' ' );
+ if( psz_parser )
+ {
+ i_ret = atoi( psz_parser + 1 );
+ if( i_ret >= 80 )
+ {
+ i_width = i_ret;
+ }
+ }
+ }
+
+ pclose( file );
+ }
+#endif
+
+ return i_width;
+}
projects / vlc / blobdiff