X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=89a5cde7efbcfd7a7a109da8721a3bdf63183840;hb=b89d540af12211361bfaa82a200872b3ba4f0eb0;hp=d161ba0b0c8b00fe5fbfc160be9f765d2915cf41;hpb=2e0409a12910ea5ee7a314501b6c11fe9689fe79;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index d161ba0b0c..89a5cde7ef 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -32,16 +32,21 @@ /***************************************************************************** * 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 "interface/interface.h" #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -71,8 +76,6 @@ # include #endif -#include "vlc_os_specific.h" - #include #include @@ -90,29 +93,32 @@ #include "playlist/playlist_internal.h" +#include + /***************************************************************************** - * The evil global variable. We handle it with care, don't worry. + * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_global_data_t libvlc_global; -static libvlc_global_data_t * p_libvlc_global = NULL; static libvlc_int_t * p_static_vlc = NULL; static volatile unsigned int i_instances = 0; +static bool b_daemon = false; + /***************************************************************************** * 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 ); +static void ListModules ( libvlc_int_t *, bool ); static void Version ( void ); #ifdef WIN32 -static void ShowConsole ( vlc_bool_t ); +static void ShowConsole ( bool ); static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); @@ -122,9 +128,6 @@ 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. ***************************************************************************** @@ -133,12 +136,7 @@ uint32_t CPUCapabilities( void ); *****************************************************************************/ 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; } @@ -148,39 +146,31 @@ libvlc_int_t * vlc_current_object( int i_object ) */ 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. */ - p_libvlc_global = &libvlc_global; - /* 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( p_libvlc_global ); - if( i_ret < 0 ) return NULL; + if (vlc_threads_init ()) + return NULL; + libvlc_global_data_t *p_libvlc_global = vlc_global(); /* Now that the thread system is initialized, we don't have much, but - * at least we have var_Create */ - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); + * at least we have variables */ + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); i_instances++; - if( !libvlc_global.b_ready ) + if( !p_libvlc_global->b_ready ) { /* Guess what CPU we have */ cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ - libvlc_global.p_module_bank = NULL; + p_libvlc_global->p_module_bank = NULL; - libvlc_global.b_ready = VLC_TRUE; + p_libvlc_global->b_ready = true; } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); /* Allocate a libvlc instance object */ p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC ); @@ -189,34 +179,36 @@ 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"; + p_libvlc->p_interaction = NULL; + p_libvlc->p_vlm = NULL; + p_libvlc->psz_object_name = strdup( "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; + p_libvlc->b_color = 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; @@ -231,16 +223,17 @@ 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[] ) { + libvlc_global_data_t *p_libvlc_global = vlc_global(); char p_capabilities[200]; char * p_tmp = NULL; char * psz_modules = NULL; char * psz_parser = NULL; char * psz_control = NULL; - vlc_bool_t b_exit = VLC_FALSE; + bool b_exit = 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 ) \ @@ -256,25 +249,23 @@ 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 = strdup( ppsz_argv[0] ); + const char *tmp = exe; + while( *exe ) { - if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp; - else ++p_tmp; + if( *exe++ == '/' ) + tmp = exe; } + p_libvlc->psz_object_name = strdup( tmp ); } else { - p_libvlc->psz_object_name = "vlc"; + p_libvlc->psz_object_name = strdup( "vlc" ); } /* * 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"... */ @@ -286,74 +277,40 @@ 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 ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) { 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; + b_exit = 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; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* 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; + p_libvlc_global->p_module_bank->b_cache_delete = 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" ); @@ -361,15 +318,15 @@ 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 ) { msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + b_exit = true; } - libvlc_global.b_daemon = VLC_TRUE; + b_daemon = true; /* lets check if we need to write the pidfile */ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); @@ -387,8 +344,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 ); @@ -399,13 +356,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( ( i_pid = fork() ) < 0 ) { msg_Err( p_libvlc, "unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + b_exit = true; } else if( i_pid ) { /* This is the parent, exit right now */ msg_Dbg( p_libvlc, "closing parent process" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } else @@ -416,7 +373,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) close( STDOUT_FILENO ); close( STDERR_FILENO ); - libvlc_global.b_daemon = VLC_TRUE; + b_daemon = true; } #endif } @@ -424,8 +381,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; } @@ -436,14 +391,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) # if defined (WIN32) || defined (__APPLE__) /* This ain't really nice to have to reload the config here but it seems * the only way to do it. */ - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); + + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); /* Check if the user specified a custom language */ psz_language = config_GetPsz( p_libvlc, "language" ); if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) { - vlc_bool_t b_cache_delete = libvlc_global.p_module_bank->b_cache_delete; + bool b_cache_delete = p_libvlc_global->p_module_bank->b_cache_delete; /* Reset the default domain */ SetLanguage( psz_language ); @@ -453,11 +410,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) module_EndBank( p_libvlc ); module_InitBank( p_libvlc ); - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); - libvlc_global.p_module_bank->b_cache_delete = b_cache_delete; + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete; } - if( psz_language ) free( psz_language ); + free( psz_language ); # endif #endif @@ -471,71 +429,60 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) module_LoadPlugins( p_libvlc ); if( p_libvlc->b_die ) { - b_exit = VLC_TRUE; + b_exit = true; } 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 */ + p_libvlc_global->p_module_bank->i_children ); /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); - b_exit = VLC_TRUE; + b_exit = true; 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; + b_exit = 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; + ListModules( p_libvlc, false ); + b_exit = 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; + ListModules( p_libvlc, true ); + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for config file options */ - if( config_GetInt( p_libvlc, "reset-config" ) ) + if( !config_GetInt( p_libvlc, "ignore-config" ) ) { - 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" ) ) - { - 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 ); + if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + { + config_ResetAll( p_libvlc ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + config_SaveConfigFile( p_libvlc, NULL ); + } + if( config_GetInt( p_libvlc, "save-config" ) > 0 ) + { + config_LoadConfigFile( p_libvlc, NULL ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); + config_SaveConfigFile( p_libvlc, NULL ); + } } - /* 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; } @@ -548,37 +495,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* * Override default configuration with config file settings */ - config_LoadConfigFile( p_libvlc, NULL ); - - /* Hack: insert the help module here */ - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, NULL ); /* * Override configuration with command line settings */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) ) { #ifdef WIN32 - ShowConsole( VLC_FALSE ); + ShowConsole( false ); /* Pause the console because it's destroyed when we exit */ fprintf( stderr, "The command line options couldn't be loaded, check " "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 */ @@ -588,7 +523,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; @@ -606,13 +541,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } else { - /* check if a Media Player is available + /* check if VLC is available on the bus * 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.mpris.vlc", "/", "org.freedesktop.MediaPlayer", "Identity" ); /* block until a reply arrives */ p_test_reply = dbus_connection_send_with_reply_and_block( @@ -641,7 +576,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) ppsz_argv[i_input] ); p_dbus_msg = dbus_message_new_method_call( - "org.freedesktop.MediaPlayer", "/TrackList", + "org.mpris.vlc", "/TrackList", "org.freedesktop.MediaPlayer", "AddTrack" ); if ( NULL == p_dbus_msg ) @@ -653,7 +588,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" ); @@ -662,7 +597,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 ) ) @@ -712,7 +647,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 ); @@ -720,7 +655,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 @@ -773,28 +709,37 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 ); - if( p_libvlc->pf_memcpy == NULL ) - { - p_libvlc->pf_memcpy = memcpy; - } + p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; + p_libvlc->i_timers = 0; + p_libvlc->pp_timers = NULL; - if( p_libvlc->pf_memset == NULL ) + /* Init stats */ + p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) ); + if( !p_libvlc->p_stats ) { - p_libvlc->pf_memset = memset; + vlc_object_release( p_libvlc ); + return VLC_ENOMEM; } + vlc_mutex_init( p_libvlc, &p_libvlc->p_stats->lock ); + p_libvlc->p_stats_computer = NULL; - p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ); - p_libvlc->i_timers = 0; - p_libvlc->pp_timers = NULL; - vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); + /* Init the array that holds every input item */ + ARRAY_INIT( p_libvlc->input_items ); + p_libvlc->i_last_input_id = 0; /* * Initialize hotkey handling */ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); + var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER ); p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size ); /* Do a copy (we don't need to modify the strings) */ memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size ); + var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_libvlc->p_hotkeys ); + + /* Initialize interaction */ + p_libvlc->p_interaction = interaction_Init( p_libvlc ); /* Initialize playlist and get commandline files */ playlist_ThreadCreate( p_libvlc ); @@ -816,7 +761,19 @@ 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 ); + +#ifdef ENABLE_SOUT + /* Initialize VLM if vlm-conf is specified */ + psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); + if( psz_parser && *psz_parser ) + { + p_libvlc->p_vlm = vlm_New( p_libvlc ); + if( !p_libvlc->p_vlm ) + msg_Err( p_libvlc, "VLM initialization failed" ); + } + free( psz_parser ); +#endif /* * Load background interfaces @@ -832,7 +789,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 ); } @@ -851,25 +808,28 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( psz_temp ) { sprintf( psz_temp, "%s,none", psz_module ); - VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, psz_temp, false, false ); free( psz_temp ); } } - if ( psz_modules ) - { - free( psz_modules ); - } + free( psz_modules ); + free( psz_control ); /* * Always load the hotkeys interface if it exists */ - VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "hotkeys,none", false, false ); #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" ) ) - VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE ); + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) + VLC_AddIntf( 0, "dbus,none", false, 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", false, false ); #endif /* @@ -877,37 +837,37 @@ 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 ); + VLC_AddIntf( 0, "screensaver,none", false, 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 ); + VLC_AddIntf( 0, "logger,none", false, 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, + libvlc_InternalAddIntf( p_libvlc, "logger,none", false, false, 1, &psz_logmode ); } #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 ); + VLC_AddIntf( 0, "showintf,none", false, 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 ); + VLC_AddIntf( 0, "netsync,none", false, 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 ) @@ -917,12 +877,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 @@ -957,7 +917,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; } @@ -971,7 +931,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) 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" ); @@ -1006,8 +965,34 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) aout_Delete( p_aout ); } +#ifdef ENABLE_SOUT + sout_instance_t * p_sout; + + p_sout = vlc_object_find( p_libvlc, VLC_OBJECT_SOUT, FIND_CHILD ); + if( p_sout ) + { + msg_Dbg( p_sout, "removing kept stream output" ); + vlc_object_detach( (vlc_object_t*)p_sout ); + vlc_object_release( (vlc_object_t*)p_sout ); + sout_DeleteInstance( p_sout ); + } + + /* Destroy VLM if created in libvlc_InternalInit */ + if( p_libvlc->p_vlm ) + { + vlm_Delete( p_libvlc->p_vlm ); + } +#endif + + /* Free interaction */ + msg_Dbg( p_libvlc, "removing interaction" ); + vlc_object_release( p_libvlc->p_interaction ); + stats_TimersDumpAll( p_libvlc ); - stats_TimersClean( p_libvlc ); + stats_TimersCleanAll( p_libvlc ); + +#ifdef ENABLE_SOUT + announce_handler_t * p_announce; /* Free announce handler(s?) */ while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE, @@ -1018,6 +1003,21 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) vlc_object_release( p_announce ); announce_HandlerDestroy( p_announce ); } +#endif + + bool b_clean = true; + FOREACH_ARRAY( input_item_t *p_del, p_libvlc->input_items ) + msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s", + p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" ); + b_clean = false; + FOREACH_END(); + assert( b_clean ); + ARRAY_RESET( p_libvlc->input_items ); + + msg_Dbg( p_libvlc, "removing stats" ); + vlc_mutex_destroy( &p_libvlc->p_stats->lock ); + FREENULL( p_libvlc->p_stats ); + return VLC_SUCCESS; } @@ -1029,18 +1029,15 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) * \param p_libvlc the instance to destroy * \param b_release whether we should do a release on the instance */ -int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) +int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) { - vlc_value_t lockval; - if( !p_libvlc ) return VLC_EGENERIC; #ifndef WIN32 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 ) @@ -1048,11 +1045,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 @@ -1066,13 +1063,15 @@ 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 ); + var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_libvlc->p_hotkeys ); FREENULL( p_libvlc->p_hotkeys ); - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); i_instances--; if( i_instances == 0 ) @@ -1080,8 +1079,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) /* System specific cleaning code */ system_End( p_libvlc ); } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); msg_Flush( p_libvlc ); msg_Destroy( p_libvlc ); @@ -1091,13 +1089,13 @@ 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 ); + vlc_threads_end (); return VLC_SUCCESS; } @@ -1107,7 +1105,7 @@ 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, + bool b_block, bool b_play, int i_options, const char *const *ppsz_options ) { int i_err; @@ -1116,14 +1114,22 @@ 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 ) + if( b_daemon && b_block && !psz_module ) { /* Daemon mode hack. * 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 @@ -1143,19 +1149,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. ***************************************************************************** @@ -1196,7 +1215,7 @@ static inline int LoadMessages (void) #else char psz_path[1024]; if (snprintf (psz_path, sizeof (psz_path), "%s/%s", - libvlc_global.psz_vlcpath, "locale") + p_libvlc_global->psz_vlcpath, "locale") >= (int)sizeof (psz_path)) return -1; @@ -1209,7 +1228,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) @@ -1235,7 +1254,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; @@ -1256,7 +1275,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 ); } @@ -1272,7 +1291,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] ) static void Help( libvlc_int_t *p_this, char const *psz_help_name ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif if( psz_help_name && !strcmp( psz_help_name, "help" ) ) @@ -1323,9 +1342,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 @@ -1338,25 +1358,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_description_hack; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; + bool b_description = config_GetInt( p_this, "help-verbose" ) > 0; + bool b_description_hack; + bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_has_advanced = 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 = 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 ); @@ -1369,7 +1400,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Enumerate the config for each module */ for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - vlc_bool_t b_help_module; + bool b_help_module; 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; @@ -1377,7 +1408,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( psz_module_name && strcmp( psz_module_name, p_parser->psz_object_name ) ) { - const char **pp_shortcut = p_parser->pp_shortcuts; + const char *const *pp_shortcut = p_parser->pp_shortcuts; while( *pp_shortcut ) { if( !strcmp( psz_module_name, *pp_shortcut ) ) @@ -1440,14 +1471,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 = true; continue; } @@ -1500,6 +1532,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 = ">"; @@ -1603,9 +1637,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 { @@ -1709,7 +1743,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( b_description_hack && p_item->psz_longtext ) { sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); - b_description_hack = VLC_FALSE; + b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); goto description; @@ -1717,6 +1751,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 ); } @@ -1727,19 +1771,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * Print a list of all available modules (builtins and plugins) and a short * description for each one. *****************************************************************************/ -static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) +static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { vlc_list_t *p_list = NULL; module_t *p_parser = NULL; char psz_spaces[22]; int i_index; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + bool b_color = config_GetInt( p_this, "color" ) > 0; memset( psz_spaces, ' ', 22 ); #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif /* List all modules */ @@ -1770,8 +1814,8 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) if( b_verbose ) { - const char **pp_shortcut = p_parser->pp_shortcuts; - while( pp_shortcut && *pp_shortcut ) + const char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) { if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) { @@ -1795,14 +1839,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] = ' '; @@ -1823,7 +1859,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) static void Version( void ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); @@ -1831,7 +1867,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 ); @@ -1846,7 +1882,7 @@ static void Version( void ) * This function is useful only on Win32. *****************************************************************************/ #ifdef WIN32 /* */ -static void ShowConsole( vlc_bool_t b_dofile ) +static void ShowConsole( bool b_dofile ) { # ifndef UNDER_CE FILE *f_help = NULL; @@ -1854,6 +1890,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 ); @@ -1898,34 +1939,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; @@ -2033,6 +2061,7 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) #ifdef HAVE_HAL_1 libhal_ctx_shutdown( ctx, NULL ); dbus_connection_unref( p_connection ); + libhal_ctx_free( ctx ); #else hal_shutdown( ctx ); #endif