X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=5b5675207d466444e9949dca46c01d5dfefca902;hb=fa12ecbec387b7d09fc2deadc16d5af83256092b;hp=1c70a8f92e387c0f95d591bf4cb5ef152b46bdbb;hpb=3ea2708daa0caa8419e9a3d1bcd967d09f445ab8;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 1c70a8f92e..5b5675207d 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -37,11 +37,11 @@ #include #include "modules/modules.h" -#include "modules/configuration.h" +#include "config/config.h" #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -105,7 +105,7 @@ static volatile unsigned int i_instances = 0; 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 ); @@ -193,34 +193,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"; /* 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; @@ -235,7 +237,8 @@ libvlc_int_t * libvlc_InternalCreate( void ) * - message queue, module bank and playlist initialization * - configuration and commandline parsing */ -int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) +int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, + const char *ppsz_argv[] ) { char p_capabilities[200]; char * p_tmp = NULL; @@ -244,7 +247,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) char * psz_control = NULL; vlc_bool_t b_exit = VLC_FALSE; int i_ret = VLC_EEXIT; - module_t *p_help_module = NULL; playlist_t *p_playlist = NULL; vlc_value_t val; #if defined( ENABLE_NLS ) \ @@ -260,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 @@ -275,10 +277,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* * Support for gettext */ -#ifdef HAVE_LC_MESSAGES - setlocale( LC_MESSAGES, "" ); -#endif - setlocale( LC_CTYPE, "" ); LoadMessages (); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ @@ -290,24 +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_module_create( VLC_OBJECT(p_libvlc) ); - if( p_help_module == NULL ) - { - module_EndBank( p_libvlc ); - return VLC_EGENERIC; - } - p_help_module->psz_object_name = "help"; - p_help_module->psz_longname = N_("Help options"); - config_Duplicate( p_help_module, libvlc_config, libvlc_config_count ); - vlc_object_attach( p_help_module, libvlc_global.p_module_bank ); - /* End hack */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) ) { - vlc_object_detach( p_help_module ); - config_Free( p_help_module ); - vlc_object_destroy( p_help_module ); module_EndBank( p_libvlc ); return VLC_EGENERIC; } @@ -328,25 +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) ); - 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" ) ) @@ -354,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" ); @@ -391,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 ); @@ -428,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; } @@ -481,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" )) ) { @@ -517,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; } @@ -554,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 */ @@ -570,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 */ @@ -657,7 +592,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" ); @@ -836,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 ); } @@ -859,10 +794,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) free( psz_temp ); } } - if ( psz_modules ) - { - free( psz_modules ); - } + free( psz_modules ); + free( psz_control ); /* * Always load the hotkeys interface if it exists @@ -874,6 +807,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) * 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 /* @@ -1052,8 +990,8 @@ 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 ); @@ -1070,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 ); @@ -1099,7 +1039,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) 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 ); @@ -1147,15 +1087,27 @@ 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; }; @@ -1213,7 +1165,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) @@ -1239,7 +1191,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; @@ -1260,7 +1212,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 ); } @@ -1327,9 +1279,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 @@ -1342,6 +1295,7 @@ 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; @@ -1351,6 +1305,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) 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" ); + vlc_bool_t b_has_advanced = VLC_FALSE; memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START ); psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; @@ -1358,9 +1313,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) psz_spaces_longtext[LINE_START+2] = '\0'; 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 ); @@ -1388,6 +1349,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) break; pp_shortcut ++; } + if( !*pp_shortcut ) + continue; } /* Ignore modules without config options */ @@ -1442,14 +1405,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) signed int i; size_t i_cur_width; - /* Skip deprecated options */ - if( p_item->psz_current ) + /* Skip removed options */ + if( p_item->b_removed ) { continue; } /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { + b_has_advanced = VLC_TRUE; continue; } @@ -1502,6 +1466,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 = ">"; @@ -1605,9 +1571,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 { @@ -1719,6 +1685,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } } + if( b_has_advanced ) + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options." ) ); + /* Release the module list */ vlc_list_release( p_list ); } @@ -1772,7 +1742,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) if( b_verbose ) { - const char **pp_shortcut = p_parser->pp_shortcuts; + const char *const *pp_shortcut = p_parser->pp_shortcuts; while( *pp_shortcut ) { if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) @@ -1797,14 +1767,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] = ' ';