X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=e2ba1cf66ea1b95d4b9f721da4a963faff5ba555;hb=3065549c736b9f84832ef282cd61fc6d00090e93;hp=05d967ad30b88ad1c754e1f727e2f623a276d93f;hpb=e85a5a618dde3b1d131ffca1cd373a9d3f845fc6;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 05d967ad30..e2ba1cf66e 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -1,5 +1,5 @@ /***************************************************************************** - * libvlc-common.c: libvlc instances creation and deletion + * libvlc-common.c: libvlc instances creation and deletion, interfaces handling ***************************************************************************** * Copyright (C) 1998-2006 the VideoLAN team * $Id$ @@ -29,19 +29,15 @@ * This file contains functions to create and destroy libvlc instances */ -/***************************************************************************** - * Pretend we are a builtin module - *****************************************************************************/ -#define MODULE_NAME main -#define MODULE_PATH main -#define __BUILTIN__ - /***************************************************************************** * Preamble *****************************************************************************/ #include -#include -#include +#include "control/libvlc_internal.h" +#include + +#include "misc/modules.h" +#include "misc/configuration.h" #include /* ENOMEM */ #include /* sprintf() */ @@ -66,41 +62,47 @@ # include #endif +#ifdef HAVE_DBUS_3 +/* used for one-instance mode */ +# include +#endif + #ifdef HAVE_HAL # include #endif -#include "vlc_cpu.h" /* CPU detection */ -#include "os_specific.h" +#include "vlc_os_specific.h" -#include "vlc_error.h" +#include +#include -#include "vlc_playlist.h" -#include "vlc_interface.h" +#include +#include "audio_output/aout_internal.h" -#include "audio_output.h" +#include -#include "vlc_video.h" -#include "video_output.h" +#include +#include "stream_output/stream_output.h" -#include "stream_output.h" -#include "charset.h" +#include #include "libvlc.h" +#include "playlist/playlist_internal.h" + /***************************************************************************** * The evil global variable. We handle it with care, don't worry. *****************************************************************************/ static libvlc_global_data_t libvlc_global; -static libvlc_global_data_t * p_libvlc_global; -static libvlc_int_t * p_static_vlc; +static libvlc_global_data_t * p_libvlc_global = NULL; +static libvlc_int_t * p_static_vlc = NULL; +static volatile unsigned int i_instances = 0; /***************************************************************************** * Local prototypes *****************************************************************************/ -void LocaleInit( vlc_object_t * ); -void LocaleDeinit( void ); static void SetLanguage ( char const * ); +static inline int LoadMessages (void); static int GetFilenames ( libvlc_int_t *, int, char *[] ); static void Help ( libvlc_int_t *, char const *psz_help_name ); static void Usage ( libvlc_int_t *, char const *psz_module_name ); @@ -118,6 +120,9 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); +/* Refs misc/cpu.c */ +uint32_t CPUCapabilities( void ); + /***************************************************************************** * vlc_current_object: return the current object. ***************************************************************************** @@ -144,6 +149,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) int i_ret; libvlc_int_t * p_libvlc = NULL; vlc_value_t lockval; + char *psz_env = NULL; /* &libvlc_global never changes, * so we can safely call this multiple times. */ @@ -159,32 +165,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); var_Get( p_libvlc_global, "libvlc", &lockval ); vlc_mutex_lock( lockval.p_address ); + + i_instances++; + if( !libvlc_global.b_ready ) { - char *psz_env; - /* Guess what CPU we have */ libvlc_global.i_cpu = CPUCapabilities(); - - /* Find verbosity from VLC_VERBOSE environment variable */ - psz_env = getenv( "VLC_VERBOSE" ); - libvlc_global.i_verbose = psz_env ? atoi( psz_env ) : -1; - -#if defined( HAVE_ISATTY ) && !defined( WIN32 ) - libvlc_global.b_color = isatty( 2 ); /* 2 is for stderr */ -#else - libvlc_global.b_color = VLC_FALSE; -#endif - - /* Initialize message queue */ - msg_Create( p_libvlc_global ); - - /* Announce who we are */ - msg_Dbg( p_libvlc_global, COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc_global, "libvlc was configured with %s", - CONFIGURE_LINE ); - - /* The module bank will be initialized later */ + /* The module bank will be initialized later */ libvlc_global.p_module_bank = NULL; libvlc_global.b_ready = VLC_TRUE; @@ -194,21 +182,39 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Allocate a libvlc instance object */ p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC ); - if( p_libvlc == NULL ) return NULL; + if( p_libvlc == NULL ) + { + i_instances--; + return NULL; + } p_libvlc->thread_id = 0; p_libvlc->p_playlist = NULL; p_libvlc->psz_object_name = "libvlc"; + /* Initialize message queue */ + msg_Create( p_libvlc ); + /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); + + /* Find verbosity from VLC_VERBOSE environment variable */ + psz_env = getenv( "VLC_VERBOSE" ); + p_libvlc->i_verbose = psz_env ? atoi( psz_env ) : -1; + +#if defined( HAVE_ISATTY ) && !defined( WIN32 ) + p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */ +#else + p_libvlc->b_color = VLC_FALSE; +#endif + /* Initialize mutexes */ vlc_mutex_init( p_libvlc, &p_libvlc->config_lock ); #ifdef __APPLE__ vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock ); vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW ); #endif - - /* Store our newly allocated structure in the global list */ - vlc_object_attach( p_libvlc, p_libvlc_global ); - + /* Fake attachment */ + p_libvlc->b_attached = VLC_TRUE; /* Store data for the non-reentrant API */ p_static_vlc = p_libvlc; @@ -226,14 +232,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) { char p_capabilities[200]; - char * p_tmp; - char * psz_modules; - char * psz_parser; - char * psz_control; + char * p_tmp = NULL; + char * psz_modules = NULL; + char * psz_parser = NULL; + char * psz_control = NULL; vlc_bool_t b_exit = VLC_FALSE; int i_ret = VLC_EEXIT; - module_t *p_help_module; - playlist_t *p_playlist; + module_t *p_help_module = NULL; + playlist_t *p_playlist = NULL; vlc_value_t val; #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) @@ -263,13 +269,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* * Support for gettext */ - SetLanguage( "" ); - - /* - * Global iconv, must be done after setlocale() - * so that vlc_current_charset() works. - */ - LocaleInit( (vlc_object_t *)p_libvlc ); +#ifdef HAVE_LC_MESSAGES + setlocale( LC_MESSAGES, "" ); +#endif + setlocale( LC_CTYPE, "" ); + LoadMessages (); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); @@ -289,7 +293,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } p_help_module->psz_object_name = "help"; p_help_module->psz_longname = N_("Help options"); - config_Duplicate( p_help_module, p_help_config ); + config_Duplicate( p_help_module, libvlc_config, libvlc_config_count ); vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); /* End hack */ @@ -323,16 +327,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( p_libvlc->psz_userdir == NULL ) p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir); p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" ); - if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~' - && p_libvlc->psz_configfile[1] == '/' ) + if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~') + && (p_libvlc->psz_configfile[1] == '/') ) { char *psz = malloc( strlen(p_libvlc->psz_userdir) + strlen(p_libvlc->psz_configfile) ); - /* This is incomplete : we should also support the ~cmassiot/ syntax. */ - sprintf( psz, "%s/%s", p_libvlc->psz_userdir, - p_libvlc->psz_configfile + 2 ); - free( p_libvlc->psz_configfile ); - p_libvlc->psz_configfile = psz; + if( psz ) + { + /* This is incomplete : we should also support the ~cmassiot/ syntax. */ + sprintf( psz, "%s/%s", p_libvlc->psz_userdir, + p_libvlc->psz_configfile + 2 ); + free( p_libvlc->psz_configfile ); + p_libvlc->psz_configfile = psz; + } /* else keep old config stuff */ } /* Check for plugins cache options */ @@ -346,24 +353,24 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* End hack */ /* Will be re-done properly later on */ - p_libvlc->p_libvlc_global->i_verbose = config_GetInt( p_libvlc, "verbose" ); + p_libvlc->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* Check for daemon mode */ #ifndef WIN32 if( config_GetInt( p_libvlc, "daemon" ) ) { #if HAVE_DAEMON + char *psz_pidfile = NULL; + if( daemon( 1, 0) != 0 ) { msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); b_exit = VLC_TRUE; } - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; /* lets check if we need to write the pidfile */ - char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); - + psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { FILE *pidfile; @@ -569,6 +576,129 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ system_Configure( p_libvlc, &i_argc, ppsz_argv ); +/* FIXME: could be replaced by using Unix sockets */ +#ifdef HAVE_DBUS_3 + dbus_threads_init_default(); + + if( config_GetInt( p_libvlc, "one-instance" ) ) + { + /* Initialise D-Bus interface, check for other instances */ + DBusConnection *p_conn = NULL; + DBusError dbus_error; + + dbus_error_init( &dbus_error ); + + /* connect to the session bus */ + p_conn = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error ); + if( !p_conn ) + { + msg_Err( p_libvlc, "Failed to connect to D-Bus session daemon: %s", + dbus_error.message ); + dbus_error_free( &dbus_error ); + } + else + { + /* check if a Media Player is available + * if not: D-Bus control is not enabled on the other + * instance and we can't pass MRLs to it */ + DBusMessage *p_test_msg = NULL; + DBusMessage *p_test_reply = NULL; + p_test_msg = dbus_message_new_method_call( + "org.freedesktop.MediaPlayer", "/", + "org.freedesktop.MediaPlayer", "Identity" ); + /* block until a reply arrives */ + p_test_reply = dbus_connection_send_with_reply_and_block( + p_conn, p_test_msg, -1, &dbus_error ); + dbus_message_unref( p_test_msg ); + if( p_test_reply == NULL ) + { + dbus_error_free( &dbus_error ); + msg_Dbg( p_libvlc, "No Media Player is running. " + "Continuing normally." ); + } + else + { + int i_input; + DBusMessage* p_dbus_msg = NULL; + DBusMessageIter dbus_args; + DBusPendingCall* p_dbus_pending = NULL; + dbus_bool_t b_play; + + dbus_message_unref( p_test_reply ); + msg_Warn( p_libvlc, "Another Media Player is running. Exiting"); + + for( i_input = optind;i_input < i_argc;i_input++ ) + { + msg_Dbg( p_libvlc, "Adds %s to the running Media Player", + ppsz_argv[i_input] ); + + p_dbus_msg = dbus_message_new_method_call( + "org.freedesktop.MediaPlayer", "/TrackList", + "org.freedesktop.MediaPlayer", "AddTrack" ); + + if ( NULL == p_dbus_msg ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + + /* append MRLs */ + dbus_message_iter_init_append( p_dbus_msg, &dbus_args ); + if ( !dbus_message_iter_append_basic( &dbus_args, + DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) + { + msg_Err( p_libvlc, "Out of memory" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ENOMEM ); + } + b_play = TRUE; + if( config_GetInt( p_libvlc, "playlist-enqueue" ) ) + b_play = FALSE; + if ( !dbus_message_iter_append_basic( &dbus_args, + DBUS_TYPE_BOOLEAN, &b_play ) ) + { + msg_Err( p_libvlc, "Out of memory" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ENOMEM ); + } + + /* send message and get a handle for a reply */ + if ( !dbus_connection_send_with_reply ( p_conn, + p_dbus_msg, &p_dbus_pending, -1 ) ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + + if ( NULL == p_dbus_pending ) + { + msg_Err( p_libvlc, "D-Bus problem" ); + dbus_message_unref( p_dbus_msg ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); + } + dbus_connection_flush( p_conn ); + dbus_message_unref( p_dbus_msg ); + /* block until we receive a reply */ + dbus_pending_call_block( p_dbus_pending ); + dbus_pending_call_unref( p_dbus_pending ); + } /* processes all command line MRLs */ + + /* bye bye */ + system_End( p_libvlc ); + exit( VLC_SUCCESS ); + } + } + /* we unreference the connection when we've finished with it */ + dbus_connection_unref( p_conn ); + } +#endif + /* * Message queue options */ @@ -582,16 +712,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); - libvlc_global.b_color = libvlc_global.b_color && - config_GetInt( p_libvlc, "color" ); + p_libvlc->b_color = p_libvlc->b_color && config_GetInt( p_libvlc, "color" ); /* * Output messages that may still be in the queue */ msg_Flush( p_libvlc ); - /* p_libvlc initialization. FIXME ? */ - if( !config_GetInt( p_libvlc, "fpu" ) ) libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU; @@ -657,9 +784,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) * Initialize hotkey handling */ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); - p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) ); + p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size ); /* Do a copy (we don't need to modify the strings) */ - memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) ); + memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size ); /* Initialize playlist and get commandline files */ playlist_ThreadCreate( p_libvlc ); @@ -679,7 +806,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( psz_modules && *psz_modules ) { /* Add service discovery modules */ - playlist_AddSDModules( p_playlist, psz_modules ); + playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); } if( psz_modules ) free( psz_modules ); @@ -748,8 +875,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) == 1 ) { - char *psz_logmode = "logmode=syslog"; - libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE, + const char *psz_logmode = "logmode=syslog"; + libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); } #endif @@ -806,10 +933,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { - intf_thread_t * p_intf; - vout_thread_t * p_vout; - aout_instance_t * p_aout; - announce_handler_t * p_announce; + intf_thread_t * p_intf = NULL; + vout_thread_t * p_vout = NULL; + aout_instance_t * p_aout = NULL; + announce_handler_t * p_announce = NULL; /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); @@ -819,6 +946,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) vlc_object_detach( p_intf ); vlc_object_release( p_intf ); intf_Destroy( p_intf ); + p_intf = NULL; } /* Free playlist */ @@ -868,6 +996,31 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) */ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) { + vlc_value_t lockval; + + if( !p_libvlc ) + return VLC_EGENERIC; + +#ifndef WIN32 + char* psz_pidfile = NULL; + + if( p_libvlc->p_libvlc_global->p_module_bank ) + if( config_GetInt( p_libvlc, "daemon" ) ) + { + psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + if( psz_pidfile != NULL ) + { + msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); + if( unlink( psz_pidfile ) == -1 ) + { + msg_Dbg( p_libvlc, "removing pid file %s: failed: %s", + psz_pidfile, strerror(errno) ); + } + } + free ( psz_pidfile ); + } +#endif + if( p_libvlc->p_memcpy_module ) { module_Unneed( p_libvlc, p_libvlc->p_memcpy_module ); @@ -882,27 +1035,33 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) FREENULL( p_libvlc->psz_configfile ); FREENULL( p_libvlc->p_hotkeys ); - /* System specific cleaning code */ - system_End( p_libvlc ); + var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + i_instances--; - /* - * Free message queue. - * Nobody shall use msg_* afterward. - */ - msg_Flush( p_libvlc ); - msg_Destroy( p_libvlc_global ); + if( i_instances == 0 ) + { + /* System specific cleaning code */ + system_End( p_libvlc ); + } + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_libvlc_global, "libvlc" ); - /* Destroy global iconv */ - LocaleDeinit(); + msg_Flush( p_libvlc ); + msg_Destroy( p_libvlc ); /* Destroy mutexes */ vlc_mutex_destroy( &p_libvlc->config_lock ); + vlc_mutex_destroy( &p_libvlc->timer_lock ); - vlc_object_detach( p_libvlc ); if( b_release ) vlc_object_release( p_libvlc ); vlc_object_destroy( p_libvlc ); + p_libvlc = NULL; - /* Stop thread system: last one out please shut the door! */ + /* Stop thread system: last one out please shut the door! + * The number of initializations of the thread system is counted, we + * can call this each time */ vlc_threads_end( p_libvlc_global ); return VLC_SUCCESS; @@ -914,10 +1073,13 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, vlc_bool_t b_block, vlc_bool_t b_play, - int i_options, char **ppsz_options ) + int i_options, const char *const *ppsz_options ) { int i_err; - intf_thread_t *p_intf; + intf_thread_t *p_intf = NULL; + + if( !p_libvlc ) + return VLC_EGENERIC; #ifndef WIN32 if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module ) @@ -933,7 +1095,6 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, /* Try to create the interface */ p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf", i_options, ppsz_options ); - if( p_intf == NULL ) { msg_Err( p_libvlc, "interface \"%s\" initialization failed", @@ -953,12 +1114,13 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, { vlc_object_detach( p_intf ); intf_Destroy( p_intf ); + p_intf = NULL; return i_err; } return VLC_SUCCESS; }; - +#if defined (__APPLE__) || defined (WIN32) /***************************************************************************** * SetLanguage: set the interface language. ***************************************************************************** @@ -966,61 +1128,70 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, * as well as the LC_CTYPE category for string sorting and possible wide * character support. *****************************************************************************/ -static void SetLanguage ( char const *psz_lang ) +static void SetLanguage ( const char *psz_lang ) { -#if defined( ENABLE_NLS ) \ - && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) +#ifdef __APPLE__ + /* I need that under Darwin, please check it doesn't disturb + * other platforms. --Meuuh */ + setenv( "LANG", psz_lang, 1 ); - char * psz_path; -#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS ) - char psz_tmp[1024]; +#else + /* 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 ) - setlocale( LC_MESSAGES, psz_lang ); -# endif - setlocale( LC_CTYPE, psz_lang ); - } - else if( psz_lang ) - { -#ifdef __APPLE__ - /* 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 - * 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 ); + setlocale( LC_ALL, psz_lang ); +} #endif - setlocale( LC_ALL, psz_lang ); - } +static inline int LoadMessages (void) +{ +#if defined( ENABLE_NLS ) \ + && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) /* Specify where to find the locales for current domain */ #if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS ) - psz_path = LOCALEDIR; + static const char psz_path[] = LOCALEDIR; #else - snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath, - "locale" ); - psz_path = psz_tmp; + char psz_path[1024]; + if (snprintf (psz_path, sizeof (psz_path), "%s/%s", + libvlc_global.psz_vlcpath, "locale") + >= (int)sizeof (psz_path)) + return -1; + #endif - if( !bindtextdomain( PACKAGE_NAME, psz_path ) ) + if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL) { - fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n", - PACKAGE_NAME, psz_path ); + fprintf (stderr, "Warning: cannot bind text domain "PACKAGE_NAME + " to directory %s\n", psz_path); + return -1; } - /* Set the default domain */ - bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); + /* LibVLC wants all messages in UTF-8. + * Unfortunately, we cannot ask UTF-8 for strerror(), strsignal() + * and other functions that are not part of our text domain. + */ + if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL) + { + fprintf (stderr, "Error: cannot set Unicode encoding for text domain " + PACKAGE_NAME"\n"); + // Unbinds the text domain to avoid broken encoding + bindtextdomain (PACKAGE_NAME, "DOES_NOT_EXIST"); + return -1; + } + + /* LibVLC does NOT set the default textdomain, since it is a library. + * This could otherwise break programs using LibVLC (other than VLC). + * textdomain (PACKAGE_NAME); + */ #endif + return 0; } /***************************************************************************** @@ -1037,7 +1208,6 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) * and their input options */ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) { - const char *psz_target; i_options = 0; /* Count the input options */ @@ -1049,13 +1219,11 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) /* TODO: write an internal function of this one, to avoid * unnecessary lookups. */ - /* FIXME: should we convert options to UTF-8 as well ?? */ - psz_target = FromLocale( ppsz_argv[ i_opt ] ); - VLC_AddTarget( p_vlc->i_object_id, psz_target, + + VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt], (char const **)( i_options ? &ppsz_argv[i_opt + 1] : NULL ), i_options, PLAYLIST_INSERT, 0 ); - LocaleFree( psz_target ); } return VLC_SUCCESS; @@ -1074,13 +1242,13 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) if( psz_help_name && !strcmp( psz_help_name, "help" ) ) { - utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); + utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name ); Usage( p_this, "help" ); Usage( p_this, "main" ); } else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) ) { - utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name ); + utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name ); Usage( p_this, NULL ); } else if( psz_help_name ) @@ -1101,22 +1269,25 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) { #define FORMAT_STRING " %s --%s%s%s%s%s%s%s " - /* short option ------' | | | | | | | - * option name ------------' | | | | | | - * -----------------------------' | | | - * padding spaces ---------------------' | | - * comment -------------------------------' | - * comment suffix --------------------------' + /* short option ------' | | | | | | | + * option name ------------' | | | | | | + * -------------------------' | | | + * 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 *p_list; - module_t *p_parser; - module_config_t *p_item; +#ifdef WIN32 +# define OPTION_VALUE_SEP "=" +#else +# define OPTION_VALUE_SEP " " +#endif + vlc_list_t *p_list = NULL; char psz_spaces_text[PADDING_SPACES+LINE_START+1]; char psz_spaces_longtext[LINE_START+3]; char psz_format[sizeof(FORMAT_STRING)]; @@ -1141,13 +1312,22 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) for( i_index = 0; i_index < p_list->i_count; i_index++ ) { vlc_bool_t b_help_module; - - p_parser = (module_t *)p_list->p_values[i_index].p_object ; + module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; + module_config_t *p_item = NULL; + module_config_t *p_end = p_parser->p_config + p_parser->confsize; if( psz_module_name && strcmp( psz_module_name, p_parser->psz_object_name ) ) { - continue; + char **pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) + { + if( !strcmp( psz_module_name, *pp_shortcut ) ) + break; + pp_shortcut ++; + } + if( !*pp_shortcut ) + continue; } /* Ignore modules without config options */ @@ -1160,13 +1340,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( !b_advanced ) { for( p_item = p_parser->p_config; - p_item->i_type != CONFIG_HINT_END; + p_item < p_end; p_item++ ) { if( (p_item->i_type & CONFIG_ITEM) && !p_item->b_advanced ) break; } - if( p_item->i_type == CONFIG_HINT_END ) continue; } /* Print name of module */ @@ -1177,12 +1356,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Print module options */ for( p_item = p_parser->p_config; - p_item->i_type != CONFIG_HINT_END; + p_item < p_end; p_item++ ) { char *psz_text, *psz_spaces = psz_spaces_text; - char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; - char *psz_suf = "", *psz_prefix = NULL; + const char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; + const char *psz_suf = "", *psz_prefix = NULL; signed int i; /* Skip deprecated options */ @@ -1211,34 +1390,38 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_ITEM_MODULE_CAT: case CONFIG_ITEM_MODULE_LIST: case CONFIG_ITEM_MODULE_LIST_CAT: - psz_bra = " <"; psz_type = _("string"); psz_ket = ">"; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("string"); + psz_ket = ">"; if( p_item->ppsz_list ) { - psz_bra = " {"; + psz_bra = OPTION_VALUE_SEP "{"; psz_type = psz_buffer; - psz_type[0] = '\0'; + psz_buffer[0] = '\0'; for( i = 0; p_item->ppsz_list[i]; i++ ) { - if( i ) strcat( psz_type, "," ); - strcat( psz_type, p_item->ppsz_list[i] ); + if( i ) strcat( psz_buffer, "," ); + strcat( psz_buffer, p_item->ppsz_list[i] ); } psz_ket = "}"; } break; case CONFIG_ITEM_INTEGER: case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ - psz_bra = " <"; psz_type = _("integer"); psz_ket = ">"; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("integer"); + psz_ket = ">"; if( p_item->i_list ) { - psz_bra = " {"; + psz_bra = OPTION_VALUE_SEP "{"; psz_type = psz_buffer; - psz_type[0] = '\0'; + psz_buffer[0] = '\0'; for( i = 0; p_item->ppsz_list_text[i]; i++ ) { - if( i ) strcat( psz_type, ", " ); - sprintf( psz_type + strlen(psz_type), "%i (%s)", + if( i ) strcat( psz_buffer, ", " ); + sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], p_item->ppsz_list_text[i] ); } @@ -1246,13 +1429,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } break; case CONFIG_ITEM_FLOAT: - psz_bra = " <"; psz_type = _("float"); psz_ket = ">"; + psz_bra = OPTION_VALUE_SEP "<"; + psz_type = _("float"); + psz_ket = ">"; break; case CONFIG_ITEM_BOOL: psz_bra = ""; psz_type = ""; psz_ket = ""; if( !b_help_module ) { - psz_suf = p_item->i_value ? _(" (default enabled)") : + psz_suf = p_item->value.i ? _(" (default enabled)") : _(" (default disabled)"); } break; @@ -1384,8 +1569,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) *****************************************************************************/ static void ListModules( libvlc_int_t *p_this ) { - vlc_list_t *p_list; - module_t *p_parser; + vlc_list_t *p_list = NULL; + module_t *p_parser = NULL; char psz_spaces[22]; int i_index; @@ -1460,7 +1645,7 @@ static void Version( void ) static void ShowConsole( vlc_bool_t b_dofile ) { # ifndef UNDER_CE - FILE *f_help; + FILE *f_help = NULL; if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ @@ -1475,7 +1660,6 @@ static void ShowConsole( vlc_bool_t b_dofile ) freopen( "vlc-help.txt", "wt", stdout ); utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") ); } - else freopen( "CONOUT$", "w", stdout ); # endif @@ -1513,8 +1697,9 @@ static int ConsoleWidth( void ) int i_width = 80; #ifndef WIN32 - char buf[20], *psz_parser; - FILE *file; + char buf[20]; + char *psz_parser = NULL; + FILE *file = NULL; int i_ret; file = popen( "stty size 2>/dev/null", "r" ); @@ -1545,11 +1730,11 @@ static int ConsoleWidth( void ) static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable, vlc_value_t old_val, vlc_value_t new_val, void *param) { - libvlc_int_t *p_vlc = (libvlc_int_t *)p_this; + libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this; if( new_val.i_int >= -1 ) { - p_vlc->p_libvlc_global->i_verbose = __MIN( new_val.i_int, 2 ); + p_libvlc->i_verbose = __MIN( new_val.i_int, 2 ); } return VLC_SUCCESS; } @@ -1562,21 +1747,26 @@ static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable, static void InitDeviceValues( libvlc_int_t *p_vlc ) { #ifdef HAVE_HAL - LibHalContext * ctx; + LibHalContext * ctx = NULL; int i, i_devices; - char **devices; - char *block_dev; + char **devices = NULL; + char *block_dev = NULL; dbus_bool_t b_dvd; - DBusConnection *p_connection; + DBusConnection *p_connection = NULL; DBusError error; #ifdef HAVE_HAL_1 - ctx = libhal_ctx_new(); + ctx = libhal_ctx_new(); if( !ctx ) return; dbus_error_init( &error ); p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error ); if( dbus_error_is_set( &error ) ) { +#ifdef HAVE_HAL_1 + libhal_ctx_shutdown( ctx, NULL ); +#else + hal_shutdown( ctx ); +#endif dbus_error_free( &error ); return; } @@ -1637,6 +1827,7 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) #ifdef HAVE_HAL_1 libhal_ctx_shutdown( ctx, NULL ); + dbus_connection_unref( p_connection ); #else hal_shutdown( ctx ); #endif