X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=8803b76ab71092076dc9c350f329b9ef4d2b2a95;hb=3d0196c72e0e16b1aabb7e4f105db370b206957c;hp=c70e0068ded113058d80f81fd3a23ff3cc34eb5b;hpb=8dcd943c03cf3c621aaa22cff4c7b24f39249f4d;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index c70e0068de..8803b76ab7 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -29,23 +29,19 @@ * 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 "modules/modules.h" +#include "config/config.h" #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -67,34 +63,28 @@ #endif #ifdef HAVE_DBUS_3 +/* used for one-instance mode */ # include - -/* this is also defined in modules/control/dbus.h */ -/* names registered on the session bus */ -#define VLC_DBUS_SERVICE "org.videolan.vlc" -#define VLC_DBUS_INTERFACE "org.videolan.vlc" -#define VLC_DBUS_OBJECT_PATH "/org/videolan/vlc" #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" @@ -104,20 +94,21 @@ * 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; +#define p_libvlc_global (&libvlc_global) +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 ); +#if defined (__APPLE__) || defined (WIN32) static void SetLanguage ( char const * ); -static int GetFilenames ( libvlc_int_t *, int, char *[] ); +#endif +static inline int LoadMessages (void); +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 * ); +static void ListModules ( libvlc_int_t *, vlc_bool_t ); static void Version ( void ); #ifdef WIN32 @@ -131,6 +122,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. ***************************************************************************** @@ -157,11 +153,13 @@ libvlc_int_t * libvlc_InternalCreate( void ) int i_ret; libvlc_int_t * p_libvlc = NULL; vlc_value_t lockval; - char *psz_env; + char *psz_env = NULL; +#if 0 /* &libvlc_global never changes, * so we can safely call this multiple times. */ p_libvlc_global = &libvlc_global; +#endif /* vlc_threads_init *must* be the first internal call! No other call is * allowed before the thread system has been initialized. */ @@ -179,7 +177,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) if( !libvlc_global.b_ready ) { /* Guess what CPU we have */ - libvlc_global.i_cpu = CPUCapabilities(); + cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ libvlc_global.p_module_bank = NULL; @@ -190,75 +188,47 @@ 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 ) { i_instances--; return NULL; } - p_libvlc->thread_id = 0; + if( p_libvlc == NULL ) + { + i_instances--; + return NULL; + } 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 ); + if( strcmp( p_libvlc->psz_object_name, "cvlc" ) ) /* Not running with cvlc */ + msg_Info( p_libvlc, "Running vlc with the default interface. Use 'cvlc' to use vlc without interface."); + /* 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 - /* Fake attachment */ - p_libvlc->b_attached = VLC_TRUE; /* Store data for the non-reentrant API */ p_static_vlc = p_libvlc; return p_libvlc; } -/* - * D-Bus callback needed in libvlc_InternalInit() - */ -#ifdef HAVE_DBUS_3 -/* Handling of messages received on / object */ -static DBusHandlerResult handle_root - ( DBusConnection *p_conn, DBusMessage *p_from, void *p_data ) -{ - DBusMessage* p_msg = dbus_message_new_method_return( p_from ); - if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY; - - DBusMessageIter args; - dbus_message_iter_init_append( p_msg, &args ); - - char *p_root = malloc( strlen( "" ) ); - if (!p_root ) return DBUS_HANDLER_RESULT_NEED_MEMORY; - sprintf( p_root, "" ); - - if( !dbus_message_iter_append_basic( &args, DBUS_TYPE_STRING, &p_root ) ) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - - if( !dbus_connection_send( p_conn, p_msg, NULL ) ) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - dbus_connection_flush( p_conn ); - dbus_message_unref( p_msg ); - return DBUS_HANDLER_RESULT_HANDLED; -} -/* vtable passed to dbus_connection_register_object_path() */ -static DBusObjectPathVTable vlc_dbus_root_vtable = { - NULL, handle_root, NULL, NULL, NULL, NULL -}; - -#endif - /** * Initialize a libvlc instance * This function initializes a previously allocated libvlc instance: @@ -267,17 +237,17 @@ static DBusObjectPathVTable vlc_dbus_root_vtable = { * - 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; - 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; + playlist_t *p_playlist = NULL; vlc_value_t val; #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) @@ -292,11 +262,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 @@ -307,13 +277,7 @@ 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 ); + LoadMessages (); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); @@ -324,25 +288,8 @@ 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_object_create( p_libvlc, VLC_OBJECT_MODULE ); - 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, p_help_config, - sizeof (p_help_config) / sizeof (p_help_config[0]) ); - 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; } @@ -363,22 +310,11 @@ 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) ); - /* 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; - } + 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" ) ) @@ -386,10 +322,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) 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" ); @@ -398,17 +330,17 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) 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; + 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; @@ -423,8 +355,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 ); @@ -452,7 +384,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) close( STDOUT_FILENO ); close( STDERR_FILENO ); - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; + libvlc_global.b_daemon = VLC_TRUE; } #endif } @@ -460,8 +392,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; } @@ -513,10 +443,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" )) ) { @@ -535,7 +461,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* Check for module list option */ else if( config_GetInt( p_libvlc, "list" ) ) { - ListModules( p_libvlc ); + ListModules( p_libvlc, VLC_FALSE ); + b_exit = VLC_TRUE; + i_ret = VLC_EEXITSUCCESS; + } + else if( config_GetInt( p_libvlc, "list-verbose" ) ) + { + ListModules( p_libvlc, VLC_TRUE ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } @@ -543,29 +475,19 @@ 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" ) ) { - 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 ); } - /* 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; } @@ -580,10 +502,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 */ @@ -596,19 +514,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 */ @@ -616,162 +525,125 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* FIXME: could be replaced by using Unix sockets */ #ifdef HAVE_DBUS_3 - /* Initialise D-Bus interface, check for other instances */ - DBusConnection *p_conn; - DBusError dbus_error; - int i_dbus_service; - dbus_threads_init_default(); - dbus_error_init( &dbus_error ); - /* connect to the session bus */ - p_conn = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error ); - if( !p_conn ) + if( config_GetInt( p_libvlc, "one-instance" ) ) { - msg_Err( p_libvlc, "Failed to connect to the D-Bus session daemon: %s", - dbus_error.message ); - dbus_error_free( &dbus_error ); - } - else - { - /* we request the service org.videolan.vlc */ - i_dbus_service = dbus_bus_request_name( p_conn, VLC_DBUS_SERVICE, 0, - &dbus_error ); - if( dbus_error_is_set( &dbus_error ) ) - { - msg_Err( p_libvlc, "Error requesting %s service: %s\n", - VLC_DBUS_SERVICE, dbus_error.message ); + /* 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 { - if( i_dbus_service != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) - { /* the name is already registered by another instance of vlc */ - if( config_GetInt( p_libvlc, "one-instance" ) ) + /* 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.mpris.vlc", "/", + "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++ ) { - /* check if /org/videolan/vlc exists - * if not: D-Bus control is not enabled on the other - * instance and we can't pass MRLs to it */ - DBusMessage *p_test_msg, *p_test_reply; - p_test_msg = dbus_message_new_method_call( - VLC_DBUS_SERVICE, VLC_DBUS_OBJECT_PATH, - VLC_DBUS_INTERFACE, "Nothing" ); - /* block unti 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 ) + msg_Dbg( p_libvlc, "Adds %s to the running Media Player", + ppsz_argv[i_input] ); + + p_dbus_msg = dbus_message_new_method_call( + "org.mpris.vlc", "/TrackList", + "org.freedesktop.MediaPlayer", "AddTrack" ); + + if ( NULL == p_dbus_msg ) { - dbus_error_free( &dbus_error ); - msg_Err( p_libvlc, "one instance mode has been " - "set but D-Bus control interface is not " - "enabled. Enable it and restart vlc, or " - "disable one instance mode." ); + msg_Err( p_libvlc, "D-Bus problem" ); + system_End( p_libvlc ); + exit( VLC_ETIMEOUT ); } - else + + /* 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] ) ) { - dbus_message_unref( p_test_reply ); - msg_Warn( p_libvlc, - "Another vlc instance exists: will now exit"); - - int i_input; - DBusMessage* p_dbus_msg; - DBusMessageIter dbus_args; - DBusPendingCall* p_dbus_pending; - dbus_bool_t b_play; - - for( i_input = optind;i_input < i_argc;i_input++ ) - { - msg_Dbg( p_libvlc, "Give %s to other vlc\n", - ppsz_argv[i_input] ); - - p_dbus_msg = dbus_message_new_method_call( - VLC_DBUS_SERVICE, VLC_DBUS_OBJECT_PATH, - VLC_DBUS_INTERFACE, "AddMRL" ); - - if ( NULL == p_dbus_msg ) - { - msg_Err( p_libvlc, "D-Bus problem" ); - system_End( p_libvlc ); - exit( 0 ); - } - - /* 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( 0 ); - } - 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( 0 ); - } - - /* 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( 0 ); - } - - if ( NULL == p_dbus_pending ) - { - msg_Err( p_libvlc, "D-Bus problem" ); - dbus_message_unref( p_dbus_msg ); - system_End( p_libvlc ); - exit( 0 ); - } - 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 */ + msg_Err( p_libvlc, "Out of memory" ); + dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); - exit( 0 ); + exit( VLC_ENOMEM ); } - } /* we're not in one-instance mode */ - else - { - msg_Dbg( p_libvlc, - "%s is already registered on the session bus\n", - VLC_DBUS_SERVICE ); - } - } /* the named is owned by something else */ - else - { - /* register "/" object */ - if( !dbus_connection_register_object_path( p_conn, "/", - &vlc_dbus_root_vtable, NULL ) ) - { - msg_Err( p_libvlc, "Out of memory" ); - } - msg_Dbg( p_libvlc, - "We are the primary owner of %s on the session bus", - VLC_DBUS_SERVICE ); + 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 ); } - } /* no error when requesting the name on the bus */ + } /* we unreference the connection when we've finished with it */ - dbus_connection_unref( p_conn ); - } /* ( p_conn != NULL ) */ + if( p_conn ) dbus_connection_unref( p_conn ); + } #endif /* @@ -794,30 +666,28 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) */ msg_Flush( p_libvlc ); - /* p_libvlc initialization. FIXME ? */ - if( !config_GetInt( p_libvlc, "fpu" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU; + cpu_flags &= ~CPU_CAPABILITY_FPU; #if defined( __i386__ ) || defined( __x86_64__ ) if( !config_GetInt( p_libvlc, "mmx" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX; + cpu_flags &= ~CPU_CAPABILITY_MMX; if( !config_GetInt( p_libvlc, "3dn" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW; + cpu_flags &= ~CPU_CAPABILITY_3DNOW; if( !config_GetInt( p_libvlc, "mmxext" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT; + cpu_flags &= ~CPU_CAPABILITY_MMXEXT; if( !config_GetInt( p_libvlc, "sse" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE; + cpu_flags &= ~CPU_CAPABILITY_SSE; if( !config_GetInt( p_libvlc, "sse2" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2; + cpu_flags &= ~CPU_CAPABILITY_SSE2; #endif #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_libvlc, "altivec" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC; + cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; #endif #define PRINT_CAPABILITY( capability, string ) \ - if( libvlc_global.i_cpu & capability ) \ + if( vlc_CPU() & capability ) \ { \ strncat( p_capabilities, string " ", \ sizeof(p_capabilities) - strlen(p_capabilities) ); \ @@ -861,9 +731,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 ); @@ -901,7 +771,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 ); } @@ -924,16 +794,26 @@ 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 */ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_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 ); + + /* Prevents the power management daemon to suspend the computer + * when VLC is active */ + if( config_GetInt( p_libvlc, "inhibit" ) ) + VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE ); +#endif + /* * If needed, load the Xscreensaver interface * Currently, only for X @@ -953,7 +833,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) if( config_GetInt( p_libvlc, "syslog" ) == 1 ) { const char *psz_logmode = "logmode=syslog"; - libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE, + libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); } #endif @@ -968,6 +848,26 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); } +#ifdef WIN32 + if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 ) + { + char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + if( psz_codecs ) + { + char *psz_morecodecs; + asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs); + if( psz_morecodecs ) + { + config_PutPsz( p_libvlc, "codec", psz_morecodecs); + free(psz_morecodecs); + } + } + else + config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); + free(psz_codecs); + } +#endif + /* * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin */ @@ -1010,10 +910,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" ); @@ -1023,6 +923,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 */ @@ -1074,6 +975,29 @@ 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( 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: %m", + psz_pidfile ); + } + } + free ( psz_pidfile ); + } +#endif + if( p_libvlc->p_memcpy_module ) { module_Unneed( p_libvlc, p_libvlc->p_memcpy_module ); @@ -1084,7 +1008,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 ); @@ -1097,9 +1023,6 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) { /* System specific cleaning code */ system_End( p_libvlc ); - - /* Destroy global iconv */ - LocaleDeinit(); } vlc_mutex_unlock( lockval.p_address ); var_Destroy( p_libvlc_global, "libvlc" ); @@ -1109,12 +1032,14 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) /* Destroy mutexes */ vlc_mutex_destroy( &p_libvlc->config_lock ); + vlc_mutex_destroy( &p_libvlc->timer_lock ); 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! - * 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 ); @@ -1130,10 +1055,13 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, 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 ) + if( libvlc_global.b_daemon && b_block && !psz_module ) { /* Daemon mode hack. * We prefer the dummy interface if none is specified. */ @@ -1146,7 +1074,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", @@ -1160,18 +1087,31 @@ 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) /***************************************************************************** * SetLanguage: set the interface language. ***************************************************************************** @@ -1179,61 +1119,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 ); - const 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: cannot bind text domain "PACKAGE_NAME + " to directory %s\n", psz_path); + return -1; + } + + /* LibVLC wants all messages in UTF-8. + * 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) { - fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n", - PACKAGE_NAME, psz_path ); + 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; } - /* Set the default domain */ - bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" ); + /* 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; } /***************************************************************************** @@ -1242,7 +1191,7 @@ static void SetLanguage ( char const *psz_lang ) * 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; @@ -1250,7 +1199,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 */ @@ -1262,26 +1210,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 ?? */ -#ifdef WIN32 - if( GetVersion() < 0x80000000 ) - { - 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 ); - } - else -#endif - { - psz_target = FromLocale( ppsz_argv[ i_opt ] ); - VLC_AddTarget( p_vlc->i_object_id, psz_target, - (char const **)( i_options ? &ppsz_argv[i_opt + 1] : + VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt], + ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), i_options, PLAYLIST_INSERT, 0 ); - LocaleFree( psz_target ); - } } return VLC_SUCCESS; @@ -1300,13 +1233,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 ) @@ -1338,6 +1271,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * * The purpose of having bra and ket is that we might i18n them as well. */ + +# define COL(x) "\033[" #x ";1m" +# define RED COL(31) +# define GREEN COL(32) +# define YELLOW COL(33) +# define BLUE COL(34) +# define MAGENTA COL(35) +# define CYAN COL(36) +# define WHITE COL(37) +# 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 #ifdef WIN32 @@ -1345,39 +1291,65 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) #else # define OPTION_VALUE_SEP " " #endif - vlc_list_t *p_list; + 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)]; + 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); - vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ); - vlc_bool_t b_description; + 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" ); 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'; - strcpy( psz_format, FORMAT_STRING ); + 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 ); + /* Ugly hack to make sure that the help options always come first + * (part 1) */ + if( !psz_module_name ) + Usage( p_this, "help" ); + /* Enumerate the config for each module */ for( i_index = 0; i_index < p_list->i_count; i_index++ ) { vlc_bool_t b_help_module; module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; - module_config_t *p_item, - *p_end = p_parser->p_config + p_parser->confsize; + 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; + const char *const *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 */ @@ -1386,6 +1358,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) continue; } + b_help_module = !strcmp( "help", p_parser->psz_object_name ); + /* Ugly hack to make sure that the help options always come first + * (part 2) */ + if( !psz_module_name && b_help_module ) + continue; + /* Ignore modules with only advanced config options if requested */ if( !b_advanced ) { @@ -1400,9 +1378,20 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Print name of module */ if( strcmp( "main", p_parser->psz_object_name ) ) - utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); - - b_help_module = !strcmp( "help", p_parser->psz_object_name ); + { + if( b_color ) + utf8_fprintf( stdout, "\n " GREEN "%s" GRAY "\n", + p_parser->psz_longname ); + else + utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); + } + if( p_parser->psz_help ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help ); + else + utf8_fprintf( stdout, " %s\n", p_parser->psz_help ); + } /* Print module options */ for( p_item = p_parser->p_config; @@ -1413,9 +1402,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) const char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; const char *psz_suf = "", *psz_prefix = NULL; 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; } @@ -1430,7 +1420,41 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_HINT_CATEGORY: case CONFIG_HINT_USAGE: if( !strcmp( "main", p_parser->psz_object_name ) ) - utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + { + if( b_color ) + utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, + p_item->psz_text ); + else + utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + } + if( b_description && p_item->psz_longtext ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN " %s\n" GRAY, + p_item->psz_longtext ); + else + utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + } + break; + + case CONFIG_HINT_SUBCATEGORY: + if( strcmp( "main", p_parser->psz_object_name ) ) + break; + case CONFIG_SECTION: + if( b_color ) + { + utf8_fprintf( stdout, RED" %s:\n"GRAY, + p_item->psz_text ); + if( b_description && p_item->psz_longtext ) + utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, + p_item->psz_longtext ); + } + else + { + utf8_fprintf( stdout, " %s:\n", p_item->psz_text ); + if( b_description && p_item->psz_longtext ) + utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + } break; case CONFIG_ITEM_STRING: @@ -1463,6 +1487,13 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_type = _("integer"); psz_ket = ">"; + if( p_item->min.i || p_item->max.i ) + { + sprintf( psz_buffer, "%s [%i .. %i]", psz_type, + p_item->min.i, p_item->max.i ); + psz_type = psz_buffer; + } + if( p_item->i_list ) { psz_bra = OPTION_VALUE_SEP "{"; @@ -1482,6 +1513,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("float"); psz_ket = ">"; + if( p_item->min.f || p_item->max.f ) + { + sprintf( psz_buffer, "%s [%f .. %f]", psz_type, + p_item->min.f, p_item->max.f ); + psz_type = psz_buffer; + } break; case CONFIG_ITEM_BOOL: psz_bra = ""; psz_type = ""; psz_ket = ""; @@ -1530,9 +1567,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 { @@ -1544,19 +1581,32 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* We wrap the rest of the output */ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf ); - b_description = config_GetInt( p_this, "help-verbose" ); + b_description_hack = b_description; description: psz_text = psz_buffer; + i_cur_width = b_description && !b_description_hack + ? i_width_description + : i_width; while( *psz_text ) { char *psz_parser, *psz_word; size_t i_end = strlen( psz_text ); /* If the remaining text fits in a line, print it. */ - if( i_end <= (size_t)i_width ) + if( i_end <= i_cur_width ) { - utf8_fprintf( stdout, "%s\n", psz_text ); + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n"GRAY, psz_text ); + else + utf8_fprintf( stdout, "%s\n", psz_text ); + } + else + { + utf8_fprintf( stdout, "%s\n", psz_text ); + } break; } @@ -1571,7 +1621,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_parser = psz_parser ? psz_parser + 1 : psz_text + i_end; - } while( psz_parser - psz_text <= i_width ); + } while( (size_t)(psz_parser - psz_text) <= i_cur_width ); /* We cut a word in one of these cases: * - it's the only word in the line and it's too long. @@ -1579,27 +1629,51 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * going to wrap is longer than 40% of the width, and even * if the word would have fit in the next line. */ if( psz_word == psz_text - || ( psz_word - psz_text < 80 * i_width / 100 - && psz_parser - psz_word > 40 * i_width / 100 ) ) + || ( (size_t)(psz_word - psz_text) < 80 * i_cur_width / 100 + && (size_t)(psz_parser - psz_word) > 40 * i_cur_width / 100 ) ) { - char c = psz_text[i_width]; - psz_text[i_width] = '\0'; - utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); - psz_text += i_width; + char c = psz_text[i_cur_width]; + psz_text[i_cur_width] = '\0'; + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n%s"GRAY, + psz_text, psz_spaces ); + else + utf8_fprintf( stdout, "%s\n%s", + psz_text, psz_spaces ); + } + else + { + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + } + psz_text += i_cur_width; psz_text[0] = c; } else { psz_word[-1] = '\0'; - utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + if( b_color ) + { + if( !b_description || b_description_hack ) + utf8_fprintf( stdout, BLUE"%s\n%s"GRAY, + psz_text, psz_spaces ); + else + utf8_fprintf( stdout, "%s\n%s", + psz_text, psz_spaces ); + } + else + { + utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces ); + } psz_text = psz_word; } } - if( b_description && p_item->psz_longtext ) + if( b_description_hack && p_item->psz_longtext ) { sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); - b_description = VLC_FALSE; + b_description_hack = VLC_FALSE; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); goto description; @@ -1617,13 +1691,15 @@ 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 ) +static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) { - 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; + vlc_bool_t b_color = config_GetInt( p_this, "color" ); + memset( psz_spaces, ' ', 22 ); #ifdef WIN32 @@ -1646,8 +1722,44 @@ static void ListModules( libvlc_int_t *p_this ) if( i < 0 ) i = 0; psz_spaces[i] = 0; - utf8_fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name, - psz_spaces, p_parser->psz_longname ); + if( b_color ) + utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY, + p_parser->psz_object_name, + psz_spaces, + p_parser->psz_longname ); + else + utf8_fprintf( stdout, " %s%s %s\n", + p_parser->psz_object_name, + psz_spaces, p_parser->psz_longname ); + + if( b_verbose ) + { + const char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) + { + if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) + { + if( b_color ) + utf8_fprintf( stdout, CYAN" s %s\n"GRAY, + *pp_shortcut ); + else + utf8_fprintf( stdout, " s %s\n", + *pp_shortcut ); + } + pp_shortcut++; + } + if( p_parser->psz_capability ) + { + if( b_color ) + utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY, + p_parser->psz_capability, + p_parser->i_score ); + else + utf8_fprintf( stdout, " c %s (%d)\n", + p_parser->psz_capability, + p_parser->i_score ); + } + } psz_spaces[i] = ' '; } @@ -1674,11 +1786,9 @@ static void Version( void ) utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); -#ifndef HAVE_SHARED_LIBVLC if( strcmp( VLC_Changeset(), "exported" ) ) utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"), VLC_Changeset() ); -#endif utf8_fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ @@ -1695,7 +1805,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 */ @@ -1710,7 +1820,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 @@ -1748,8 +1857,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" ); @@ -1781,6 +1891,9 @@ 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_libvlc = (libvlc_int_t *)p_this; + (void)psz_variable; + (void)old_val; + (void)param; if( new_val.i_int >= -1 ) { @@ -1797,20 +1910,21 @@ 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; - DBusError error; #ifdef HAVE_HAL_1 - ctx = libhal_ctx_new(); + DBusConnection *p_connection = NULL; + DBusError error; + + 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 ) ) + if( dbus_error_is_set( &error ) || !p_connection ) { dbus_error_free( &error ); return; @@ -1818,8 +1932,10 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) libhal_ctx_set_dbus_connection( ctx, p_connection ); if( libhal_ctx_init( ctx, &error ) ) #else - if( ( ctx = hal_initialize( NULL, FALSE ) ) ) + ctx = hal_initialize( NULL, FALSE ); + if( ctx ) #endif + { #ifdef HAVE_HAL_1 if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) ) @@ -1881,5 +1997,7 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) { msg_Warn( p_vlc, "Unable to get HAL device properties" ); } -#endif +#else + (void)p_vlc; +#endif /* HAVE_HAL */ }