X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=9e33d92bebad25638c416af0669084618a528081;hb=7a9a29f49f46c7133846190c700d1725ce668a25;hp=68e87fa58e1897be57ddb6d376e482aa16d0e1f3;hpb=533af1752cb0569225ca22b903925cbe00b99d85;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 68e87fa58e..9e33d92beb 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -32,16 +32,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "control/libvlc_internal.h" #include #include "modules/modules.h" -#include "modules/configuration.h" +#include "config/configuration.h" #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -71,8 +75,6 @@ # include #endif -#include "vlc_os_specific.h" - #include #include @@ -94,18 +96,19 @@ * The evil global variable. We handle it with care, don't worry. *****************************************************************************/ static libvlc_global_data_t libvlc_global; -#define p_libvlc_global (&libvlc_global) +static libvlc_global_data_t *p_libvlc_global = &libvlc_global; static libvlc_int_t * p_static_vlc = NULL; static volatile unsigned int i_instances = 0; /***************************************************************************** * Local prototypes *****************************************************************************/ -#if defined (__APPLE__) || defined (WIN32) +#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ + ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) static void SetLanguage ( char const * ); #endif static inline int LoadMessages (void); -static int GetFilenames ( libvlc_int_t *, int, char *[] ); +static int GetFilenames ( libvlc_int_t *, int, const char *[] ); static void Help ( libvlc_int_t *, char const *psz_help_name ); static void Usage ( libvlc_int_t *, char const *psz_module_name ); static void ListModules ( libvlc_int_t *, vlc_bool_t ); @@ -122,6 +125,11 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); +libvlc_global_data_t *vlc_global( void ) +{ + return &libvlc_global; +} + /***************************************************************************** * vlc_current_object: return the current object. ***************************************************************************** @@ -130,12 +138,7 @@ static void InitDeviceValues( libvlc_int_t * ); *****************************************************************************/ libvlc_int_t * vlc_current_object( int i_object ) { - if( i_object ) - { - return vlc_object_get( p_libvlc_global, i_object ); - } - - return p_static_vlc; + return i_object ? vlc_object_get( i_object ) : p_static_vlc; } @@ -188,34 +191,35 @@ libvlc_int_t * libvlc_InternalCreate( void ) 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( psz_env != NULL ) + p_libvlc->i_verbose = atoi( psz_env ); + else + p_libvlc->i_verbose = 3; #if defined( HAVE_ISATTY ) && !defined( WIN32 ) p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */ #else p_libvlc->b_color = VLC_FALSE; #endif + /* 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 ); + /* Initialize mutexes */ + vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); 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 - /* Fake attachment */ - p_libvlc->b_attached = VLC_TRUE; /* Store data for the non-reentrant API */ p_static_vlc = p_libvlc; @@ -230,7 +234,8 @@ libvlc_int_t * libvlc_InternalCreate( void ) * - message queue, module bank and playlist initialization * - configuration and commandline parsing */ -int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) +int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, + const char *ppsz_argv[] ) { char p_capabilities[200]; char * p_tmp = NULL; @@ -239,7 +244,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) char * psz_control = NULL; vlc_bool_t b_exit = VLC_FALSE; int i_ret = VLC_EEXIT; - module_t *p_help_module = NULL; playlist_t *p_playlist = NULL; vlc_value_t val; #if defined( ENABLE_NLS ) \ @@ -255,11 +259,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* Get the executable name (similar to the basename command) */ if( i_argc > 0 ) { - p_libvlc->psz_object_name = p_tmp = ppsz_argv[ 0 ]; - while( *p_tmp ) + const char *exe = p_libvlc->psz_object_name = ppsz_argv[0]; + while( *exe ) { - if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp; - else ++p_tmp; + if( *exe++ == '/' ) + p_libvlc->psz_object_name = exe; } } else @@ -270,10 +274,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* * Support for gettext */ -#ifdef HAVE_LC_MESSAGES - setlocale( LC_MESSAGES, "" ); -#endif - setlocale( LC_CTYPE, "" ); LoadMessages (); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ @@ -285,37 +285,21 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) * options) */ module_InitBank( p_libvlc ); - /* Hack: insert the help module here */ - p_help_module = vlc_module_create( VLC_OBJECT(p_libvlc) ); - if( p_help_module == NULL ) - { - module_EndBank( p_libvlc ); - return VLC_EGENERIC; - } - p_help_module->psz_object_name = "help"; - p_help_module->psz_longname = N_("Help options"); - config_Duplicate( p_help_module, libvlc_config, libvlc_config_count ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) ) { - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); return VLC_EGENERIC; } /* Check for short help option */ - if( config_GetInt( p_libvlc, "help" ) ) + if( config_GetInt( p_libvlc, "help" ) > 0 ) { Help( p_libvlc, "help" ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ - else if( config_GetInt( p_libvlc, "version" ) ) + else if( config_GetInt( p_libvlc, "version" ) > 0 ) { Version(); b_exit = VLC_TRUE; @@ -323,36 +307,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } /* Set the config file stuff */ - p_libvlc->psz_homedir = config_GetHomeDir(); - p_libvlc->psz_userdir = config_GetUserDir(); - 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] == '/') ) - { - char *psz = malloc( strlen(p_libvlc->psz_userdir) - + strlen(p_libvlc->psz_configfile) ); - 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 */ - } + p_libvlc->psz_homedir = config_GetHomeDir(); + p_libvlc->psz_configdir = config_GetConfigDir( p_libvlc ); + p_libvlc->psz_datadir = config_GetUserDataDir( p_libvlc ); + p_libvlc->psz_cachedir = config_GetCacheDir( p_libvlc ); + p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc ); /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) ) + if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) { libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE; } - /* Hack: remove the help module here */ - vlc_object_detach( p_help_module ); - /* End hack */ - /* Will be re-done properly later on */ p_libvlc->i_verbose = config_GetInt( p_libvlc, "verbose" ); @@ -360,7 +326,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) #ifndef WIN32 if( config_GetInt( p_libvlc, "daemon" ) ) { -#if HAVE_DAEMON +#ifdef HAVE_DAEMON char *psz_pidfile = NULL; if( daemon( 1, 0) != 0 ) @@ -386,8 +352,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } else { - msg_Err( p_libvlc, "cannot open pid file for writing: %s (%s)", - psz_pidfile, strerror(errno) ); + msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)", + psz_pidfile ); } } free( psz_pidfile ); @@ -423,8 +389,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( b_exit ) { - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); return i_ret; } @@ -456,7 +420,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); libvlc_global.p_module_bank->b_cache_delete = b_cache_delete; } - if( psz_language ) free( psz_language ); + free( psz_language ); # endif #endif @@ -476,10 +440,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) msg_Dbg( p_libvlc, "module bank initialized, found %i modules", libvlc_global.p_module_bank->i_children ); - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ - /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) { @@ -489,20 +449,20 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ - else if( config_GetInt( p_libvlc, "longhelp" ) ) + else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) { Help( p_libvlc, "longhelp" ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ - else if( config_GetInt( p_libvlc, "list" ) ) + else if( config_GetInt( p_libvlc, "list" ) > 0 ) { ListModules( p_libvlc, VLC_FALSE ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } - else if( config_GetInt( p_libvlc, "list-verbose" ) ) + else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) { ListModules( p_libvlc, VLC_TRUE ); b_exit = VLC_TRUE; @@ -510,31 +470,21 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } /* Check for config file options */ - if( config_GetInt( p_libvlc, "reset-config" ) ) + if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) { - vlc_object_detach( p_help_module ); config_ResetAll( p_libvlc ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); config_SaveConfigFile( p_libvlc, NULL ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); } - if( config_GetInt( p_libvlc, "save-config" ) ) + if( config_GetInt( p_libvlc, "save-config" ) > 0 ) { - vlc_object_detach( p_help_module ); config_LoadConfigFile( p_libvlc, NULL ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); config_SaveConfigFile( p_libvlc, NULL ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); } - /* Hack: remove the help module here */ - vlc_object_detach( p_help_module ); - /* End hack */ - if( b_exit ) { - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); return i_ret; } @@ -549,10 +499,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ config_LoadConfigFile( p_libvlc, NULL ); - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ - /* * Override configuration with command line settings */ @@ -565,19 +511,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) "that they are valid.\n" ); PauseConsole(); #endif - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); 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 */ @@ -587,7 +524,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) #ifdef HAVE_DBUS_3 dbus_threads_init_default(); - if( config_GetInt( p_libvlc, "one-instance" ) ) + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) { /* Initialise D-Bus interface, check for other instances */ DBusConnection *p_conn = NULL; @@ -652,7 +589,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* append MRLs */ dbus_message_iter_init_append( p_dbus_msg, &dbus_args ); - if ( !dbus_message_iter_append_basic( &dbus_args, + if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) { msg_Err( p_libvlc, "Out of memory" ); @@ -661,7 +598,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) exit( VLC_ENOMEM ); } b_play = TRUE; - if( config_GetInt( p_libvlc, "playlist-enqueue" ) ) + if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 ) b_play = FALSE; if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) @@ -711,7 +648,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - if( config_GetInt( p_libvlc, "quiet" ) ) + if( config_GetInt( p_libvlc, "quiet" ) > 0 ) { val.i_int = -1; var_Set( p_libvlc, "verbose", val ); @@ -719,7 +656,8 @@ 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 ); - p_libvlc->b_color = p_libvlc->b_color && config_GetInt( p_libvlc, "color" ); + if( p_libvlc->b_color ) + p_libvlc->b_color = config_GetInt( p_libvlc, "color" ) > 0; /* * Output messages that may still be in the queue @@ -782,10 +720,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) p_libvlc->pf_memset = memset; } - p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ); + p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; p_libvlc->i_timers = 0; p_libvlc->pp_timers = NULL; - vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); /* * Initialize hotkey handling @@ -815,7 +752,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* Add service discovery modules */ playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); } - if( psz_modules ) free( psz_modules ); + free( psz_modules ); /* * Load background interfaces @@ -831,7 +768,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } else if( psz_control && *psz_control ) { - if( psz_modules ) free( psz_modules ); + free( psz_modules ); psz_modules = strdup( psz_control ); } @@ -854,10 +791,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) free( psz_temp ); } } - if ( psz_modules ) - { - free( psz_modules ); - } + free( psz_modules ); + free( psz_control ); /* * Always load the hotkeys interface if it exists @@ -867,8 +802,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) #ifdef HAVE_DBUS_3 /* loads dbus control interface if in one-instance mode * we do it only when playlist exists, because dbus module needs it */ - if( config_GetInt( p_libvlc, "one-instance" ) ) + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE ); + + /* Prevents the power management daemon to suspend the computer + * when VLC is active */ + if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) + VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE ); #endif /* @@ -876,18 +816,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) * Currently, only for X */ #ifdef HAVE_X11_XLIB_H - if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 ) + if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE ); } #endif - if( config_GetInt( p_libvlc, "file-logging" ) == 1 ) + if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) { VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE ); } #ifdef HAVE_SYSLOG_H - if( config_GetInt( p_libvlc, "syslog" ) == 1 ) + if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { const char *psz_logmode = "logmode=syslog"; libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE, @@ -895,18 +835,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } #endif - if( config_GetInt( p_libvlc, "show-intf" ) == 1 ) + if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) { VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE ); } - if( config_GetInt( p_libvlc, "network-synchronisation") == 1 ) + if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); } #ifdef WIN32 - if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 ) + if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { char *psz_codecs = config_GetPsz( p_playlist, "codec" ); if( psz_codecs ) @@ -916,12 +856,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( psz_morecodecs ) { config_PutPsz( p_libvlc, "codec", psz_morecodecs); - free(psz_morecodecs); + free( psz_morecodecs ); } } else config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); - free(psz_codecs); + free( psz_codecs ); } #endif @@ -956,7 +896,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0, PLAYLIST_INSERT, 0 ); } - if ( val.psz_string != NULL ) free( val.psz_string ); + free( val.psz_string ); return VLC_SUCCESS; } @@ -1039,7 +979,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) char* psz_pidfile = NULL; if( libvlc_global.p_module_bank ) - if( config_GetInt( p_libvlc, "daemon" ) ) + if( config_GetInt( p_libvlc, "daemon" ) > 0 ) { psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) @@ -1047,11 +987,11 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) 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) ); + msg_Dbg( p_libvlc, "removing pid file %s: %m", + psz_pidfile ); } } - free ( psz_pidfile ); + free( psz_pidfile ); } #endif @@ -1065,7 +1005,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) module_EndBank( p_libvlc ); FREENULL( p_libvlc->psz_homedir ); - FREENULL( p_libvlc->psz_userdir ); + FREENULL( p_libvlc->psz_configdir ); + FREENULL( p_libvlc->psz_datadir ); + FREENULL( p_libvlc->psz_cachedir ); FREENULL( p_libvlc->psz_configfile ); FREENULL( p_libvlc->p_hotkeys ); @@ -1090,11 +1032,11 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) vlc_mutex_destroy( &p_libvlc->timer_lock ); if( b_release ) vlc_object_release( p_libvlc ); - vlc_object_destroy( p_libvlc ); + vlc_object_release( p_libvlc ); p_libvlc = NULL; /* Stop thread system: last one out please shut the door! - * The number of initializations of the thread system is counted, we + * The number of initializations of the thread system is counted, we * can call this each time */ vlc_threads_end( p_libvlc_global ); @@ -1115,6 +1057,14 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, if( !p_libvlc ) return VLC_EGENERIC; + if( !psz_module ) /* requesting the default interface */ + { + char *psz_interface = config_GetPsz( p_libvlc, "intf" ); + if( !psz_interface || !*psz_interface ) /* "intf" has not been set */ + msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") ); + free( psz_interface ); + } + #ifndef WIN32 if( libvlc_global.b_daemon && b_block && !psz_module ) { @@ -1122,7 +1072,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, * We prefer the dummy interface if none is specified. */ char *psz_interface = config_GetPsz( p_libvlc, "intf" ); if( !psz_interface || !*psz_interface ) psz_module = "dummy"; - if( psz_interface ) free( psz_interface ); + free( psz_interface ); } #endif @@ -1142,19 +1092,32 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, /* Try to run the interface */ p_intf->b_play = b_play; - p_intf->b_block = b_block; i_err = intf_RunThread( p_intf ); - if( i_err ) + if( i_err || p_intf->b_should_run_on_first_thread ) { vlc_object_detach( p_intf ); intf_Destroy( p_intf ); p_intf = NULL; return i_err; } + + if( b_block ) + { + /* FIXME: should be moved to interface/interface.c */ + if( p_intf->pf_run ) + vlc_thread_join( p_intf ); + else + while( vlc_object_lock_and_wait( p_intf ) == 0 ); + + vlc_object_detach( p_intf ); + intf_Destroy( p_intf ); + } + return VLC_SUCCESS; }; -#if defined (__APPLE__) || defined (WIN32) +#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ + ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) /***************************************************************************** * SetLanguage: set the interface language. ***************************************************************************** @@ -1208,7 +1171,7 @@ static inline int LoadMessages (void) } /* LibVLC wants all messages in UTF-8. - * Unfortunately, we cannot ask UTF-8 for strerror(), strsignal() + * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r() * and other functions that are not part of our text domain. */ if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL) @@ -1234,7 +1197,7 @@ static inline int LoadMessages (void) * 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( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) +static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[] ) { int i_opt, i_options; @@ -1255,7 +1218,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) * unnecessary lookups. */ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt], - (char const **)( i_options ? &ppsz_argv[i_opt + 1] : + ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), i_options, PLAYLIST_INSERT, 0 ); } @@ -1322,9 +1285,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) # define BLUE COL(34) # define MAGENTA COL(35) # define CYAN COL(36) -# define WHITE COL(37) +# define WHITE COL(0) # define GRAY "\033[0m" #define COLOR_FORMAT_STRING (WHITE" %s --%s"YELLOW"%s%s%s%s%s%s "GRAY) +#define COLOR_FORMAT_STRING_BOOL (WHITE" %s --%s%s%s%s%s%s%s "GRAY) #define LINE_START 8 #define PADDING_SPACES 25 @@ -1337,25 +1301,36 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) char psz_spaces_text[PADDING_SPACES+LINE_START+1]; char psz_spaces_longtext[LINE_START+3]; char psz_format[sizeof(COLOR_FORMAT_STRING)]; + char psz_format_bool[sizeof(COLOR_FORMAT_STRING_BOOL)]; char psz_buffer[10000]; char psz_short[4]; int i_index; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; - vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ); - vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ); + vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ) > 0; + vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ) > 0; vlc_bool_t b_description_hack; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; + vlc_bool_t b_has_advanced = VLC_FALSE; memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START ); psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; memset( psz_spaces_longtext, ' ', LINE_START+2 ); psz_spaces_longtext[LINE_START+2] = '\0'; +#ifdef WIN32 + b_color = VLC_FALSE; // don't put color control codes in a .txt file +#endif if( b_color ) + { strcpy( psz_format, COLOR_FORMAT_STRING ); + strcpy( psz_format_bool, COLOR_FORMAT_STRING_BOOL ); + } else + { strcpy( psz_format, FORMAT_STRING ); + strcpy( psz_format_bool, FORMAT_STRING ); + } /* List all modules */ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); @@ -1383,6 +1358,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) break; pp_shortcut ++; } + if( !*pp_shortcut ) + continue; } /* Ignore modules without config options */ @@ -1437,14 +1414,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) signed int i; size_t i_cur_width; - /* Skip deprecated options */ - if( p_item->psz_current ) + /* Skip removed options */ + if( p_item->b_removed ) { continue; } /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { + b_has_advanced = VLC_TRUE; continue; } @@ -1497,6 +1475,8 @@ 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: + case CONFIG_ITEM_FONT: + case CONFIG_ITEM_PASSWORD: psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("string"); psz_ket = ">"; @@ -1600,9 +1580,9 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module ) { - utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name, - psz_prefix, p_item->psz_name, psz_bra, psz_type, - psz_ket, psz_spaces ); + utf8_fprintf( stdout, psz_format_bool, psz_short, + p_item->psz_name, psz_prefix, p_item->psz_name, + psz_bra, psz_type, psz_ket, psz_spaces ); } else { @@ -1714,6 +1694,16 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } } + if( b_has_advanced ) + { + if( b_color ) + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options.")); + else + utf8_fprintf( stdout, "\n %s %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options.")); + } + /* Release the module list */ vlc_list_release( p_list ); } @@ -1731,7 +1721,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) char psz_spaces[22]; int i_index; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; memset( psz_spaces, ' ', 22 ); @@ -1767,7 +1757,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) if( b_verbose ) { - const char **pp_shortcut = p_parser->pp_shortcuts; + const char *const *pp_shortcut = p_parser->pp_shortcuts; while( *pp_shortcut ) { if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) @@ -1792,14 +1782,6 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) p_parser->psz_capability, p_parser->i_score ); } - if( p_parser->psz_program ) - { - if( b_color ) - utf8_fprintf( stdout, YELLOW " p %s\n"GRAY, - p_parser->psz_program ); - else - utf8_fprintf( stdout, " p %s\n", p_parser->psz_program ); - } } psz_spaces[i] = ' '; @@ -1828,7 +1810,7 @@ static void Version( void ) VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); if( strcmp( VLC_Changeset(), "exported" ) ) - utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"), + utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"), VLC_Changeset() ); utf8_fprintf( stdout, LICENSE_MSG ); @@ -1851,6 +1833,11 @@ static void ShowConsole( vlc_bool_t b_dofile ) if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ AllocConsole(); + /* Use the ANSI code page (e.g. Windows-1252) as expected by the LibVLC + * Unicode/locale subsystem. By default, we have the obsolecent OEM code + * page (e.g. CP437 or CP850). */ + SetConsoleOutputCP (GetACP ()); + SetConsoleTitle ("VLC media player version "PACKAGE_VERSION); freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); @@ -1895,34 +1882,21 @@ static void PauseConsole( void ) *****************************************************************************/ static int ConsoleWidth( void ) { - int i_width = 80; + unsigned i_width = 80; #ifndef WIN32 - char buf[20]; - char *psz_parser = NULL; - FILE *file = NULL; - int i_ret; - - file = popen( "stty size 2>/dev/null", "r" ); - if( file ) + FILE *file = popen( "stty size 2>/dev/null", "r" ); + if (file != NULL) { - 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; - } - } - } - + if (fscanf (file, "%*u %u", &i_width) <= 0) + i_width = 80; pclose( file ); } +#else + CONSOLE_SCREEN_BUFFER_INFO buf; + + if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) + i_width = buf.dwSize.X; #endif return i_width;