X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=28408539fac1977888f456257e7379abd4d6fea5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=e9499963bed2a03977e0d40325f8107f6d04037a;hpb=cc4e24a8d6164401b7229e56108a3ba5f097f1ef;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index e9499963be..28408539fa 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -42,9 +42,7 @@ #include "modules/modules.h" #include "config/configuration.h" -#include "interface/interface.h" -#include /* ENOMEM */ #include /* sprintf() */ #include #include /* free() */ @@ -59,9 +57,7 @@ # include #endif -#ifdef WIN32 /* optind, getopt(), included in unistd.h */ -# include "extras/getopt.h" -#endif +#include "config/vlc_getopt.h" #ifdef HAVE_LOCALE_H # include @@ -72,10 +68,8 @@ # include #endif -#ifdef HAVE_HAL -# include -#endif +#include #include #include @@ -83,6 +77,11 @@ #include "audio_output/aout_internal.h" #include +#include +#include +#include +#include +#include #include "libvlc.h" @@ -121,18 +120,7 @@ void *vlc_gc_init (gc_object_t *p_gc, void (*pf_destruct) (gc_object_t *)) assert (pf_destruct); p_gc->pf_destructor = pf_destruct; - p_gc->refs = 1; -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - __sync_synchronize (); -#elif defined (WIN32) && defined (__GNUC__) -#elif defined(__APPLE__) - OSMemoryBarrier (); -#else - /* Nobody else can possibly lock the spin - it's there as a barrier */ - vlc_spin_init (&p_gc->spin); - vlc_spin_lock (&p_gc->spin); - vlc_spin_unlock (&p_gc->spin); -#endif + vlc_atomic_set (&p_gc->refs, 1); return p_gc; } @@ -144,22 +132,9 @@ void *vlc_gc_init (gc_object_t *p_gc, void (*pf_destruct) (gc_object_t *)) void *vlc_hold (gc_object_t * p_gc) { uintptr_t refs; + assert( p_gc ); - assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ - -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - refs = __sync_add_and_fetch (&p_gc->refs, 1); -#elif defined (WIN64) - refs = InterlockedIncrement64 (&p_gc->refs); -#elif defined (WIN32) - refs = InterlockedIncrement (&p_gc->refs); -#elif defined(__APPLE__) - refs = OSAtomicIncrement32Barrier((int*)&p_gc->refs); -#else - vlc_spin_lock (&p_gc->spin); - refs = ++p_gc->refs; - vlc_spin_unlock (&p_gc->spin); -#endif + refs = vlc_atomic_inc (&p_gc->refs); assert (refs != 1); /* there had to be a reference already */ return p_gc; } @@ -173,33 +148,10 @@ void vlc_release (gc_object_t *p_gc) unsigned refs; assert( p_gc ); - assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ - -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - refs = __sync_sub_and_fetch (&p_gc->refs, 1); -#elif defined (WIN64) - refs = InterlockedDecrement64 (&p_gc->refs); -#elif defined (WIN32) - refs = InterlockedDecrement (&p_gc->refs); -#elif defined(__APPLE__) - refs = OSAtomicDecrement32Barrier((int*)&p_gc->refs); -#else - vlc_spin_lock (&p_gc->spin); - refs = --p_gc->refs; - vlc_spin_unlock (&p_gc->spin); -#endif - + refs = vlc_atomic_dec (&p_gc->refs); assert (refs != (uintptr_t)(-1)); /* reference underflow?! */ if (refs == 0) - { -#ifdef USE_SYNC -#elif defined (WIN32) && defined (__GNUC__) -#elif defined(__APPLE__) -#else - vlc_spin_destroy (&p_gc->spin); -#endif p_gc->pf_destructor (p_gc); - } } /***************************************************************************** @@ -209,8 +161,7 @@ void vlc_release (gc_object_t *p_gc) ( 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, const char *[] ); +static void GetFilenames ( libvlc_int_t *, unsigned, const char *const [] ); static void Help ( libvlc_int_t *, char const *psz_help_name ); static void Usage ( libvlc_int_t *, char const *psz_search ); static void ListModules ( libvlc_int_t *, bool ); @@ -222,9 +173,8 @@ static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); -static void InitDeviceValues( libvlc_int_t * ); - static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; +extern const char psz_vlc_changeset[]; /** * Allocate a libvlc instance, initialize global data if needed @@ -247,7 +197,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) } /* Allocate a libvlc instance object */ - p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), + p_libvlc = vlc_custom_create( (vlc_object_t *)NULL, sizeof (*priv), VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; @@ -258,13 +208,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv = libvlc_priv (p_libvlc); priv->p_playlist = NULL; - priv->p_interaction = NULL; + priv->p_ml = NULL; priv->p_dialog_provider = NULL; priv->p_vlm = NULL; - p_libvlc->psz_object_name = strdup( "libvlc" ); /* Initialize message queue */ - msg_Create( p_libvlc ); + priv->msg_bank = msg_Create (); + if (unlikely(priv->msg_bank == NULL)) + goto error; /* Find verbosity from VLC_VERBOSE environment variable */ psz_env = getenv( "VLC_VERBOSE" ); @@ -279,11 +230,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) #endif /* Initialize mutexes */ + vlc_mutex_init( &priv->ml_lock ); vlc_mutex_init( &priv->timer_lock ); - vlc_mutex_init( &priv->config_lock ); - vlc_cond_init( &priv->exiting ); + vlc_ExitInit( &priv->exit ); return p_libvlc; +error: + vlc_object_release (p_libvlc); + return NULL; } /** @@ -298,7 +252,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, const char *ppsz_argv[] ) { libvlc_priv_t *priv = libvlc_priv (p_libvlc); - char p_capabilities[200]; char * p_tmp = NULL; char * psz_modules = NULL; char * psz_parser = NULL; @@ -306,7 +259,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, bool b_exit = false; int i_ret = VLC_EEXIT; playlist_t *p_playlist = NULL; - vlc_value_t val; + char *psz_val; #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) # if defined (WIN32) || defined (__APPLE__) @@ -320,7 +273,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Support for gettext */ - LoadMessages (); + vlc_bindtextdomain (PACKAGE_NAME); /* Initialize the module bank and load the configuration of the * main module. We need to do this at this stage to be able to display @@ -328,43 +281,39 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * options) */ module_InitBank( p_libvlc ); - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) + if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, NULL ) ) { module_EndBank( p_libvlc, false ); return VLC_EGENERIC; } - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE ); msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); - /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ + msg_Dbg( p_libvlc, "revision %s", psz_vlc_changeset ); + msg_Dbg( p_libvlc, "configured with %s", CONFIGURE_LINE ); + /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); /* Check for short help option */ - if( config_GetInt( p_libvlc, "help" ) > 0 ) + if( var_InheritBool( p_libvlc, "help" ) ) { Help( p_libvlc, "help" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ - else if( config_GetInt( p_libvlc, "version" ) > 0 ) + else if( var_InheritBool( p_libvlc, "version" ) ) { Version(); b_exit = true; i_ret = VLC_EEXITSUCCESS; } - /* Set the config file stuff */ - priv->psz_configfile = config_GetCustomConfigFile( p_libvlc ); - - /* Check for plugins cache options */ - bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; - /* Check for daemon mode */ #ifndef WIN32 - if( config_GetInt( p_libvlc, "daemon" ) > 0 ) + if( var_InheritBool( p_libvlc, "daemon" ) ) { #ifdef HAVE_DAEMON char *psz_pidfile = NULL; @@ -377,14 +326,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, b_daemon = true; /* lets check if we need to write the pidfile */ - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { FILE *pidfile; pid_t i_pid = getpid (); msg_Dbg( p_libvlc, "PID is %d, writing it to %s", i_pid, psz_pidfile ); - pidfile = utf8_fopen( psz_pidfile,"w" ); + pidfile = vlc_fopen( psz_pidfile,"w" ); if( pidfile != NULL ) { utf8_fprintf( pidfile, "%d", (int)i_pid ); @@ -429,7 +378,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { - free( priv->psz_configfile ); module_EndBank( p_libvlc, false ); return i_ret; } @@ -438,30 +386,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) # 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. */ - - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* Check if the user specified a custom language */ - psz_language = config_GetPsz( p_libvlc, "language" ); - if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) + psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" ); + if( psz_language && strcmp( psz_language, "auto" ) ) { /* Reset the default domain */ SetLanguage( psz_language ); /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - - module_EndBank( p_libvlc, false ); - module_InitBank( p_libvlc ); - if( !config_GetInt( p_libvlc, "ignore-config" ) ) - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); } free( psz_language ); # endif @@ -473,7 +410,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * list of configuration options exported by each module and loads their * default values. */ - module_LoadPlugins( p_libvlc, b_cache_delete ); + module_LoadPlugins( p_libvlc ); if( p_libvlc->b_die ) { b_exit = true; @@ -485,7 +422,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ - if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) + if( (p_tmp = var_InheritString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); @@ -493,29 +430,31 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, i_ret = VLC_EEXITSUCCESS; } /* Check for full help option */ - else if( config_GetInt( p_libvlc, "full-help" ) > 0 ) + else if( var_InheritBool( p_libvlc, "full-help" ) ) { - config_PutInt( p_libvlc, "advanced", 1); - config_PutInt( p_libvlc, "help-verbose", 1); + var_Create( p_libvlc, "advanced", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "advanced", true ); + var_Create( p_libvlc, "help-verbose", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "help-verbose", true ); Help( p_libvlc, "full-help" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ - else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) + else if( var_InheritBool( p_libvlc, "longhelp" ) ) { Help( p_libvlc, "longhelp" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ - else if( config_GetInt( p_libvlc, "list" ) > 0 ) + else if( var_InheritBool( p_libvlc, "list" ) ) { ListModules( p_libvlc, false ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } - else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) + else if( var_InheritBool( p_libvlc, "list-verbose" ) ) { ListModules( p_libvlc, true ); b_exit = true; @@ -523,44 +462,40 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } /* Check for config file options */ - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) { - if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + if( var_InheritBool( p_libvlc, "reset-config" ) ) { 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 ); } } + if( module_count <= 1) + { + msg_Err( p_libvlc, "No modules were found, refusing to start. Check " + "that you properly gave a module path with --plugin-path."); + b_exit = true; + i_ret = VLC_ENOITEM; + } + if( b_exit ) { - free( priv->psz_configfile ); module_EndBank( p_libvlc, true ); return i_ret; } - /* - * Init device values - */ - InitDeviceValues( p_libvlc ); - /* * Override default configuration with config file settings */ - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, NULL ); /* * Override configuration with command line settings */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) ) + int vlc_optind; + if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, &vlc_optind ) ) { #ifdef WIN32 ShowConsole( false ); @@ -569,24 +504,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, "that they are valid.\n" ); PauseConsole(); #endif - free( priv->psz_configfile ); module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); - - /* - * System specific configuration - */ - system_Configure( p_libvlc, &i_argc, ppsz_argv ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* FIXME: could be replaced by using Unix sockets */ #ifdef HAVE_DBUS dbus_threads_init_default(); - if( config_GetInt( p_libvlc, "one-instance" ) > 0 - || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" ) - && config_GetInt( p_libvlc, "started-from-file" ) ) ) + if( var_InheritBool( p_libvlc, "one-instance" ) + || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" ) + && var_InheritBool( p_libvlc, "started-from-file" ) ) ) { /* Initialise D-Bus interface, check for other instances */ DBusConnection *p_conn = NULL; @@ -633,7 +562,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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++ ) + for( i_input = vlc_optind; i_input < i_argc;i_input++ ) { msg_Dbg( p_libvlc, "Adds %s to the running Media Player", ppsz_argv[i_input] ); @@ -646,7 +575,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { msg_Err( p_libvlc, "D-Bus problem" ); system_End( p_libvlc ); - exit( VLC_ETIMEOUT ); + exit( 1 ); } /* append MRLs */ @@ -656,17 +585,17 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); - exit( VLC_ENOMEM ); + exit( 1 ); } b_play = TRUE; - if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 ) + if( var_InheritBool( p_libvlc, "playlist-enqueue" ) ) b_play = FALSE; if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) { dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); - exit( VLC_ENOMEM ); + exit( 1 ); } /* send message and get a handle for a reply */ @@ -676,7 +605,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Err( p_libvlc, "D-Bus problem" ); dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); - exit( VLC_ETIMEOUT ); + exit( 1 ); } if ( NULL == p_dbus_pending ) @@ -684,7 +613,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Err( p_libvlc, "D-Bus problem" ); dbus_message_unref( p_dbus_msg ); system_End( p_libvlc ); - exit( VLC_ETIMEOUT ); + exit( 1 ); } dbus_connection_flush( p_conn ); dbus_message_unref( p_dbus_msg ); @@ -695,7 +624,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* bye bye */ system_End( p_libvlc ); - exit( VLC_SUCCESS ); + exit( 0 ); } } /* we unreference the connection when we've finished with it */ @@ -706,7 +635,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ - char * psz_verbose_objects = config_GetPsz( p_libvlc, "verbose-objects" ); + char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" ); if( psz_verbose_objects ) { char * psz_object, * iter = psz_verbose_objects; @@ -733,35 +662,17 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Last chance to set the verbosity. Once we start interfaces and other * threads, verbosity becomes read-only. */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - if( config_GetInt( p_libvlc, "quiet" ) > 0 ) + if( var_InheritBool( p_libvlc, "quiet" ) ) { var_SetInteger( p_libvlc, "verbose", -1 ); priv->i_verbose = -1; } + vlc_threads_setup( p_libvlc ); if( priv->b_color ) - priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; - - if( !config_GetInt( p_libvlc, "fpu" ) ) - cpu_flags &= ~CPU_CAPABILITY_FPU; - -#if defined( __i386__ ) || defined( __x86_64__ ) - if( !config_GetInt( p_libvlc, "mmx" ) ) - cpu_flags &= ~CPU_CAPABILITY_MMX; - if( !config_GetInt( p_libvlc, "3dn" ) ) - cpu_flags &= ~CPU_CAPABILITY_3DNOW; - if( !config_GetInt( p_libvlc, "mmxext" ) ) - cpu_flags &= ~CPU_CAPABILITY_MMXEXT; - if( !config_GetInt( p_libvlc, "sse" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE; - if( !config_GetInt( p_libvlc, "sse2" ) ) - cpu_flags &= ~CPU_CAPABILITY_SSE2; -#endif -#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) - if( !config_GetInt( p_libvlc, "altivec" ) ) - cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; -#endif + priv->b_color = var_InheritBool( p_libvlc, "color" ); + char p_capabilities[200]; #define PRINT_CAPABILITY( capability, string ) \ if( vlc_CPU() & capability ) \ { \ @@ -769,26 +680,67 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, sizeof(p_capabilities) - strlen(p_capabilities) ); \ p_capabilities[sizeof(p_capabilities) - 1] = '\0'; \ } - p_capabilities[0] = '\0'; - PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" ); - PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" ); - PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" ); + +#if defined( __i386__ ) || defined( __x86_64__ ) + if( !var_InheritBool( p_libvlc, "mmx" ) ) + cpu_flags &= ~CPU_CAPABILITY_MMX; + if( !var_InheritBool( p_libvlc, "3dn" ) ) + cpu_flags &= ~CPU_CAPABILITY_3DNOW; + if( !var_InheritBool( p_libvlc, "mmxext" ) ) + cpu_flags &= ~CPU_CAPABILITY_MMXEXT; + if( !var_InheritBool( p_libvlc, "sse" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE; + if( !var_InheritBool( p_libvlc, "sse2" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE2; + if( !var_InheritBool( p_libvlc, "sse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE3; + if( !var_InheritBool( p_libvlc, "ssse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSSE3; + if( !var_InheritBool( p_libvlc, "sse41" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_1; + if( !var_InheritBool( p_libvlc, "sse42" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_2; + PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" ); PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSSE3, "SSSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" ); + +#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) + if( !var_InheritBool( p_libvlc, "altivec" ) ) + cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; + PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" ); - PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" ); - msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); + +#elif defined( __arm__ ) + PRINT_CAPABILITY( CPU_CAPABILITY_NEON, "NEONv1" ); + +#endif + +#if HAVE_FPU + strncat( p_capabilities, "FPU ", + sizeof(p_capabilities) - strlen( p_capabilities) ); + p_capabilities[sizeof(p_capabilities) - 1] = '\0'; +#endif + + if (p_capabilities[0]) + msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); /* * Choose the best memcpy module */ priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false ); + /* Avoid being called "memcpy":*/ + vlc_object_set_name( p_libvlc, "main" ); - priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; + priv->b_stats = var_InheritBool( p_libvlc, "stats" ); priv->i_timers = 0; priv->pp_timers = NULL; @@ -797,16 +749,23 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * 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 ); + vlc_InitActions( p_libvlc ); - /* Initialize interaction */ - priv->p_interaction = interaction_Init( p_libvlc ); + /* Create a variable for showing the fullscreen interface */ + var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "intf-show", true ); + + /* Create a variable for showing the right click menu */ + var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); + + /* variables for signalling creation of new files */ + var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING ); + var_Create( p_libvlc, "record-file", VLC_VAR_STRING ); + + /* some default internal settings */ + var_Create( p_libvlc, "window", VLC_VAR_STRING ); + var_Create( p_libvlc, "user-agent", VLC_VAR_STRING ); + var_SetString( p_libvlc, "user-agent", "(LibVLC "VERSION")" ); /* Initialize playlist and get commandline files */ p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); @@ -818,26 +777,43 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_unneed( p_libvlc, priv->p_memcpy_module ); } module_EndBank( p_libvlc, true ); - free( priv->psz_configfile ); return VLC_EGENERIC; } - playlist_Activate( p_playlist ); - vlc_object_attach( p_playlist, p_libvlc ); + + /* System specific configuration */ + system_Configure( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind ); + +#if defined(MEDIA_LIBRARY) + /* Get the ML */ + if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) == true ) + { + priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL ); + if( !priv->p_ml ) + { + msg_Err( p_libvlc, "ML initialization failed" ); + return VLC_EGENERIC; + } + } + else + { + priv->p_ml = NULL; + } +#endif /* Add service discovery modules */ - psz_modules = config_GetPsz( p_playlist, "services-discovery" ); - if( psz_modules && *psz_modules ) + psz_modules = var_InheritString( p_libvlc, "services-discovery" ); + if( psz_modules ) { char *p = psz_modules, *m; while( ( m = strsep( &p, " :," ) ) != NULL ) playlist_ServicesDiscoveryAdd( p_playlist, m ); + free( psz_modules ); } - free( psz_modules ); #ifdef ENABLE_VLM /* Initialize VLM if vlm-conf is specified */ - psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); - if( psz_parser && *psz_parser ) + psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" ); + if( psz_parser ) { priv->p_vlm = vlm_New( p_libvlc ); if( !priv->p_vlm ) @@ -849,10 +825,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Load background interfaces */ - psz_modules = config_GetPsz( p_libvlc, "extraintf" ); - psz_control = config_GetPsz( p_libvlc, "control" ); + psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); + psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); - if( psz_modules && *psz_modules && psz_control && *psz_control ) + if( psz_modules && psz_control ) { char* psz_tmp; if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) @@ -861,7 +837,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, psz_modules = psz_tmp; } } - else if( psz_control && *psz_control ) + else if( psz_control ) { free( psz_modules ); psz_modules = strdup( psz_control ); @@ -880,7 +856,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } if( asprintf( &psz_temp, "%s,none", psz_module ) != -1) { - libvlc_InternalAddIntf( p_libvlc, psz_temp ); + intf_Create( p_libvlc, psz_temp ); free( psz_temp ); } } @@ -890,94 +866,70 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Always load the hotkeys interface if it exists */ - libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); - if( module_exists( "globalhotkeys" ) ) - libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" ); + intf_Create( p_libvlc, "hotkeys,none" ); #ifdef HAVE_DBUS /* 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" ) > 0 - || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" ) - && config_GetInt( p_libvlc, "started-from-file" ) ) ) - libvlc_InternalAddIntf( p_libvlc, "dbus,none" ); + if( var_InheritBool( p_libvlc, "one-instance" ) + || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" ) + && var_InheritBool( p_libvlc, "started-from-file" ) ) ) + intf_Create( p_libvlc, "dbus,none" ); +# if !defined (HAVE_MAEMO) /* Prevents the power management daemon from suspending the system * when VLC is active */ - if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) - libvlc_InternalAddIntf( p_libvlc, "inhibit,none" ); -#endif - - /* - * If needed, load the Xscreensaver interface - * Currently, only for X - */ -#ifdef HAVE_X11_XLIB_H - if( config_GetInt( p_libvlc, "disable-screensaver" ) ) - { - libvlc_InternalAddIntf( p_libvlc, "screensaver,none" ); - } + if( var_InheritBool( p_libvlc, "inhibit" ) > 0 ) + intf_Create( p_libvlc, "inhibit,none" ); +# endif #endif - if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && - !config_GetInt( p_libvlc, "syslog" ) ) + if( var_InheritBool( p_libvlc, "file-logging" ) && + !var_InheritBool( p_libvlc, "syslog" ) ) { - libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + intf_Create( p_libvlc, "logger,none" ); } #ifdef HAVE_SYSLOG_H - if( config_GetInt( p_libvlc, "syslog" ) > 0 ) + if( var_InheritBool( p_libvlc, "syslog" ) ) { - char *logmode = var_CreateGetString( p_libvlc, "logmode" ); + char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); - libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + intf_Create( p_libvlc, "logger,none" ); if( logmode ) { var_SetString( p_libvlc, "logmode", logmode ); free( logmode ); } - else - var_Destroy( p_libvlc, "logmode" ); + var_Destroy( p_libvlc, "logmode" ); } #endif - if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) - { - libvlc_InternalAddIntf( p_libvlc, "showintf,none" ); - } - - if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) + if( var_InheritBool( p_libvlc, "network-synchronisation") ) { - libvlc_InternalAddIntf( p_libvlc, "netsync,none" ); + intf_Create( p_libvlc, "netsync,none" ); } #ifdef WIN32 - if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) + if( var_InheritBool( p_libvlc, "prefer-system-codecs") ) { - char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, "codec" ); if( psz_codecs ) { char *psz_morecodecs; - if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 ) + if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 ) { - config_PutPsz( p_libvlc, "codec", psz_morecodecs); + var_SetString( p_libvlc, "codec", psz_morecodecs); free( psz_morecodecs ); } + free( psz_codecs ); } else - config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); - free( psz_codecs ); + var_SetString( p_libvlc, "codec", "dmo"); } #endif - /* - * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin - */ - var_Create( p_libvlc, "drawable-xid", VLC_VAR_INTEGER ); - var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS ); #ifdef __APPLE__ - var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER ); -#endif var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER ); @@ -986,34 +938,28 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER ); - - /* Create volume callback system. */ - var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); - - /* Create a variable for showing the interface (moved from playlist). */ - var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); - var_SetBool( p_libvlc, "intf-show", true ); - - var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); +#endif +#ifdef WIN32 + var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS ); +#endif /* - * Get input filenames given as commandline arguments + * Get input filenames given as commandline arguments. + * We assume that the remaining parameters are filenames + * and their input options. */ - GetFilenames( p_libvlc, i_argc, ppsz_argv ); + GetFilenames( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind ); /* * Get --open argument */ - var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_libvlc, "open", &val ); - if ( val.psz_string != NULL && *val.psz_string ) + psz_val = var_InheritString( p_libvlc, "open" ); + if ( psz_val != NULL ) { - playlist_t *p_playlist = pl_Hold( p_libvlc ); - playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, + playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0, -1, 0, NULL, 0, true, pl_Unlocked ); - pl_Release( p_libvlc ); + free( psz_val ); } - free( val.psz_string ); return VLC_SUCCESS; } @@ -1025,11 +971,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { libvlc_priv_t *priv = libvlc_priv (p_libvlc); - playlist_t *p_playlist = priv->p_playlist; + playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist; /* Deactivate the playlist */ msg_Dbg( p_libvlc, "deactivating the playlist" ); - playlist_Deactivate( p_playlist ); + pl_Deactivate( p_libvlc ); /* Remove all services discovery */ msg_Dbg( p_libvlc, "removing all services discovery tasks" ); @@ -1037,14 +983,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); - intf_thread_t *p_intf; - while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) ) - { - intf_StopThread( p_intf ); - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); /* for intf_Create() */ - vlc_object_release( p_intf ); /* for vlc_object_find() */ - } + libvlc_Quit( p_libvlc ); + intf_DestroyAll( p_libvlc ); #ifdef ENABLE_VLM /* Destroy VLM if created in libvlc_InternalInit */ @@ -1054,18 +994,18 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - /* Free playlist */ - /* Any thread still running must not assume pl_Hold() succeeds. */ - msg_Dbg( p_libvlc, "removing playlist" ); + /* Free playlist now, all threads are gone */ + playlist_Destroy( p_playlist ); - libvlc_priv(p_playlist->p_libvlc)->p_playlist = NULL; - barrier(); /* FIXME is that correct ? */ - - vlc_object_release( p_playlist ); - - /* Free interaction */ - msg_Dbg( p_libvlc, "removing interaction" ); - interaction_Destroy( priv->p_interaction ); +#if defined(MEDIA_LIBRARY) + media_library_t* p_ml = priv->p_ml; + if( p_ml ) + { + ml_Destroy( VLC_OBJECT( p_ml ) ); + vlc_object_release( p_ml ); + libvlc_priv(p_playlist->p_libvlc)->p_ml = NULL; + } +#endif stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1077,7 +1017,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) if( b_daemon ) { - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); @@ -1100,10 +1040,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) /* Free module bank. It is refcounted, so we call this each time */ module_EndBank( p_libvlc, true ); - FREENULL( priv->psz_configfile ); - var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, - p_libvlc->p_hotkeys ); - FREENULL( p_libvlc->p_hotkeys ); + vlc_DeinitActions( p_libvlc ); } /** @@ -1127,12 +1064,18 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) } vlc_mutex_unlock( &global_lock ); - msg_Destroy( p_libvlc ); + msg_Destroy (priv->msg_bank); /* Destroy mutexes */ - vlc_cond_destroy( &priv->exiting ); - vlc_mutex_destroy( &priv->config_lock ); + vlc_ExitDestroy( &priv->exit ); vlc_mutex_destroy( &priv->timer_lock ); + vlc_mutex_destroy( &priv->ml_lock ); + +#ifndef NDEBUG /* Hack to dump leaked objects tree */ + if( vlc_internals( p_libvlc )->i_refcount > 1 ) + while( vlc_internals( p_libvlc )->i_refcount > 0 ) + vlc_object_release( p_libvlc ); +#endif assert( vlc_internals( p_libvlc )->i_refcount == 1 ); vlc_object_release( p_libvlc ); @@ -1143,16 +1086,13 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) */ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) { - int i_err; - intf_thread_t *p_intf = NULL; - 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 */ + char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" ); + if( !psz_interface ) /* "intf" has not been set */ { #ifndef WIN32 if( b_daemon ) @@ -1161,60 +1101,20 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) psz_module = "dummy"; else #endif - msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") ); + msg_Info( p_libvlc, "%s", + _("Running vlc with the default interface. " + "Use 'cvlc' to use vlc without interface.") ); } free( psz_interface ); + var_Destroy( p_libvlc, "intf" ); } /* Try to create the interface */ - p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); - if( p_intf == NULL ) - { + int ret = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); + if( ret ) msg_Err( p_libvlc, "interface \"%s\" initialization failed", - psz_module ); - return VLC_EGENERIC; - } - - /* Try to run the interface */ - i_err = intf_RunThread( p_intf ); - if( i_err ) - { - vlc_object_detach( p_intf ); - vlc_object_release( p_intf ); - return i_err; - } - - return VLC_SUCCESS; -}; - -static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; - -/** - * Waits until the LibVLC instance gets an exit signal. Normally, this happens - * when the user "exits" an interface plugin. - */ -void libvlc_InternalWait( libvlc_int_t *p_libvlc ) -{ - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - - vlc_mutex_lock( &exit_lock ); - while( vlc_object_alive( p_libvlc ) ) - vlc_cond_wait( &priv->exiting, &exit_lock ); - vlc_mutex_unlock( &exit_lock ); -} - -/** - * Posts an exit signal to LibVLC instance. This will normally initiate the - * cleanup and destroy process. It should only be called on behalf of the user. - */ -void libvlc_Quit( libvlc_int_t *p_libvlc ) -{ - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - - vlc_mutex_lock( &exit_lock ); - vlc_object_kill( p_libvlc ); - vlc_cond_signal( &priv->exiting ); - vlc_mutex_unlock( &exit_lock ); + psz_module ? psz_module : "default" ); + return ret; } #if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ @@ -1239,8 +1139,7 @@ static void SetLanguage ( const char *psz_lang ) * 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'; + snprintf( psz_lcall, sizeof(psz_lcall), "LC_ALL=%s", psz_lang ); putenv( psz_lcall ); #endif @@ -1248,85 +1147,39 @@ static void SetLanguage ( const char *psz_lang ) } #endif - -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 ) - static const char psz_path[] = LOCALEDIR; -#else - char psz_path[1024]; - if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", - config_GetDataDir(), "locale") - >= (int)sizeof (psz_path)) - return -1; - -#endif - 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, "Error: cannot set Unicode encoding for text domain " - PACKAGE_NAME"\n"); - // Unbinds the text domain to avoid broken encoding - bindtextdomain (PACKAGE_NAME, "DOES_NOT_EXIST"); - return -1; - } - - /* LibVLC does NOT set the default textdomain, since it is a library. - * This could otherwise break programs using LibVLC (other than VLC). - * textdomain (PACKAGE_NAME); - */ -#endif - return 0; -} - /***************************************************************************** * GetFilenames: parse command line options which are not flags ***************************************************************************** * 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, const char *ppsz_argv[] ) +static void GetFilenames( libvlc_int_t *p_vlc, unsigned n, + const char *const args[] ) { - int i_opt, i_options; - - /* We assume that the remaining parameters are filenames - * and their input options */ - for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) + while( n > 0 ) { - i_options = 0; - /* Count the input options */ - while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind ) + unsigned i_options = 0; + + while( args[--n][0] == ':' ) { i_options++; - i_opt--; + if( n == 0 ) + { + msg_Warn( p_vlc, "options %s without item", args[n] ); + return; /* syntax!? */ + } } - /* TODO: write an internal function of this one, to avoid - * unnecessary lookups. */ + char *mrl = make_URI( args[n], NULL ); + if( !mrl ) + continue; - playlist_t *p_playlist = pl_Hold( p_vlc ); - playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT, - 0, -1, - i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), VLC_INPUT_OPTION_TRUSTED, - true, pl_Unlocked ); - pl_Release( p_vlc ); + playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT, + 0, -1, i_options, ( i_options ? &args[n + 1] : NULL ), + VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked ); + free( mrl ); } - - return VLC_SUCCESS; } /***************************************************************************** @@ -1340,6 +1193,38 @@ static inline void print_help_on_full_help( void ) utf8_fprintf( stdout, "%s\n", _("To get exhaustive help, use '-H'.") ); } +static const char vlc_usage[] = N_( + "Usage: %s [options] [stream] ..." + "\nYou can specify multiple streams on the commandline. They will be enqueued in the playlist." + "\nThe first item specified will be played first." + "\n" + "\nOptions-styles:" + "\n --option A global option that is set for the duration of the program." + "\n -option A single letter version of a global --option." + "\n :option An option that only applies to the stream directly before it" + "\n and that overrides previous settings." + "\n" + "\nStream MRL syntax:" + "\n [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]" + "\n" + "\n Many of the global --options can also be used as MRL specific :options." + "\n Multiple :option=value pairs can be specified." + "\n" + "\nURL syntax:" + "\n [file://]filename Plain media file" + "\n http://ip:port/file HTTP URL" + "\n ftp://ip:port/file FTP URL" + "\n mms://ip:port/file MMS URL" + "\n screen:// Screen capture" + "\n [dvd://][device][@raw_device] DVD device" + "\n [vcd://][device] VCD device" + "\n [cdda://][device] Audio CD device" + "\n udp://[[]@[][:]]" + "\n UDP stream sent by a streaming server" + "\n vlc://pause: Special item to pause the playlist for a certain time" + "\n vlc://quit Special item to quit VLC" + "\n"); + static void Help( libvlc_int_t *p_this, char const *psz_help_name ) { #ifdef WIN32 @@ -1372,6 +1257,7 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); #endif + fflush( stdout ); } /***************************************************************************** @@ -1388,22 +1274,26 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) # define CYAN COL(36) # define WHITE COL(0) # define GRAY "\033[0m" -static void print_help_section( module_config_t *p_item, bool b_color, bool b_description ) +static void +print_help_section( const module_t *m, const module_config_t *p_item, + bool b_color, bool b_description ) { if( !p_item ) return; if( b_color ) { utf8_fprintf( stdout, RED" %s:\n"GRAY, - p_item->psz_text ); + module_gettext( m, p_item->psz_text ) ); if( b_description && p_item->psz_longtext ) utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, - p_item->psz_longtext ); + module_gettext( m, p_item->psz_longtext ) ); } else { - utf8_fprintf( stdout, " %s:\n", p_item->psz_text ); + utf8_fprintf( stdout, " %s:\n", + module_gettext( m, p_item->psz_text ) ); if( b_description && p_item->psz_longtext ) - utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + utf8_fprintf( stdout, " %s\n", + module_gettext(m, p_item->psz_longtext ) ); } } @@ -1440,10 +1330,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) char psz_short[4]; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; - bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; - bool b_description = config_GetInt( p_this, "help-verbose" ) > 0; + bool b_advanced = var_InheritBool( p_this, "advanced" ); + bool b_description = var_InheritBool( p_this, "help-verbose" ); bool b_description_hack; - bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_color = var_InheritBool( p_this, "color" ); bool b_has_advanced = false; bool b_found = false; int i_only_advanced = 0; /* Number of modules ignored because they @@ -1494,15 +1384,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) ( b_strict ? strcmp( psz_search, p_parser->psz_object_name ) : !strstr( p_parser->psz_object_name, psz_search ) ) ) { - char *const *pp_shortcut = p_parser->pp_shortcuts; - while( *pp_shortcut ) + char *const *pp_shortcuts = p_parser->pp_shortcuts; + unsigned i; + for( i = 0; i < p_parser->i_shortcuts; i++ ) { - if( b_strict ? !strcmp( psz_search, *pp_shortcut ) - : !!strstr( *pp_shortcut, psz_search ) ) + if( b_strict ? !strcmp( psz_search, pp_shortcuts[i] ) + : !!strstr( pp_shortcuts[i], psz_search ) ) break; - pp_shortcut ++; } - if( !*pp_shortcut ) + if( i == p_parser->i_shortcuts ) continue; } @@ -1543,17 +1433,20 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n", - p_parser->psz_longname, - p_parser->psz_object_name ); + module_gettext( p_parser, p_parser->psz_longname ), + p_parser->psz_object_name ); else - utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); + utf8_fprintf( stdout, "\n %s\n", + module_gettext(p_parser, p_parser->psz_longname ) ); } if( p_parser->psz_help ) { if( b_color ) - utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help ); + utf8_fprintf( stdout, CYAN" %s\n"GRAY, + module_gettext( p_parser, p_parser->psz_help ) ); else - utf8_fprintf( stdout, " %s\n", p_parser->psz_help ); + utf8_fprintf( stdout, " %s\n", + module_gettext( p_parser, p_parser->psz_help ) ); } /* Print module options */ @@ -1587,17 +1480,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, - p_item->psz_text ); + module_gettext( p_parser, p_item->psz_text ) ); else - utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + utf8_fprintf( stdout, "\n %s\n", + module_gettext( p_parser, 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 ); + module_gettext( p_parser, p_item->psz_longtext ) ); else - utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + utf8_fprintf( stdout, " %s\n", + module_gettext( p_parser, p_item->psz_longtext ) ); } break; @@ -1617,7 +1512,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) case CONFIG_ITEM_MODULE_LIST_CAT: case CONFIG_ITEM_FONT: case CONFIG_ITEM_PASSWORD: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("string"); @@ -1638,7 +1534,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) break; case CONFIG_ITEM_INTEGER: case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("integer"); @@ -1646,8 +1543,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) 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 ); + sprintf( psz_buffer, "%s [%"PRId64" .. %"PRId64"]", + psz_type, p_item->min.i, p_item->max.i ); psz_type = psz_buffer; } @@ -1661,13 +1558,14 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( i ) strcat( psz_buffer, ", " ); sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], - p_item->ppsz_list_text[i] ); + module_gettext( p_parser, p_item->ppsz_list_text[i] ) ); } psz_ket = "}"; } break; case CONFIG_ITEM_FLOAT: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("float"); @@ -1680,7 +1578,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) } break; case CONFIG_ITEM_BOOL: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = ""; psz_type = ""; psz_ket = ""; if( !b_help_module ) @@ -1741,7 +1640,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) psz_spaces[i] = ' '; /* We wrap the rest of the output */ - sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf ); + sprintf( psz_buffer, "%s%s", module_gettext( p_parser, p_item->psz_text ), + psz_suf ); b_description_hack = b_description; description: @@ -1833,7 +1733,9 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( b_description_hack && p_item->psz_longtext ) { - sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); + sprintf( psz_buffer, "%s%s", + module_gettext( p_parser, p_item->psz_longtext ), + psz_suf ); b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); @@ -1869,11 +1771,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, "\n" WHITE "%s" GRAY "\n", - _( "No matching module found. Use --list or" \ + _( "No matching module found. Use --list or " \ "--list-verbose to list available modules." ) ); else utf8_fprintf( stdout, "\n%s\n", - _( "No matching module found. Use --list or" \ + _( "No matching module found. Use --list or " \ "--list-verbose to list available modules." ) ); } @@ -1890,14 +1792,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { module_t *p_parser; - char psz_spaces[22]; - bool b_color = config_GetInt( p_this, "color" ) > 0; - - memset( psz_spaces, ' ', 22 ); + bool b_color = var_InheritBool( p_this, "color" ); #ifdef WIN32 ShowConsole( true ); + b_color = false; // don't put color control codes in a .txt file +#else + if( !isatty( 1 ) ) + b_color = false; #endif /* List all modules */ @@ -1906,39 +1809,29 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) /* Enumerate each module */ for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { - int i; - - /* Nasty hack, but right now I'm too tired to think about a nice - * solution */ - i = 22 - strlen( p_parser->psz_object_name ) - 1; - if( i < 0 ) i = 0; - psz_spaces[i] = 0; - if( b_color ) - utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY, + utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, p_parser->psz_object_name, - psz_spaces, - p_parser->psz_longname ); + module_gettext( p_parser, p_parser->psz_longname ) ); else - utf8_fprintf( stdout, " %s%s %s\n", + utf8_fprintf( stdout, " %-22s %s\n", p_parser->psz_object_name, - psz_spaces, p_parser->psz_longname ); + module_gettext( p_parser, p_parser->psz_longname ) ); if( b_verbose ) { - char *const *pp_shortcut = p_parser->pp_shortcuts; - while( *pp_shortcut ) + char *const *pp_shortcuts = p_parser->pp_shortcuts; + for( unsigned i = 0; i < p_parser->i_shortcuts; i++ ) { - if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) + if( strcmp( pp_shortcuts[i], p_parser->psz_object_name ) ) { if( b_color ) utf8_fprintf( stdout, CYAN" s %s\n"GRAY, - *pp_shortcut ); + pp_shortcuts[i] ); else utf8_fprintf( stdout, " s %s\n", - *pp_shortcut ); + pp_shortcuts[i] ); } - pp_shortcut++; } if( p_parser->psz_capability ) { @@ -1952,8 +1845,6 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) p_parser->i_score ); } } - - psz_spaces[i] = ' '; } module_list_free (list); @@ -1973,11 +1864,12 @@ static void Version( void ) ShowConsole( true ); #endif - utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); - utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), - VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); + utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(), + psz_vlc_changeset ); + utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"), + VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); - utf8_fprintf( stdout, LICENSE_MSG ); + utf8_fprintf( stdout, "%s", LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -2066,70 +1958,3 @@ static int ConsoleWidth( void ) return i_width; } - -/***************************************************************************** - * InitDeviceValues: initialize device values - ***************************************************************************** - * This function inits the dvd, vcd and cd-audio values - *****************************************************************************/ -static void InitDeviceValues( libvlc_int_t *p_vlc ) -{ -#ifdef HAVE_HAL - LibHalContext * ctx = NULL; - int i, i_devices; - char **devices = NULL; - char *block_dev = NULL; - dbus_bool_t b_dvd; - - 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 ) || !p_connection ) - { - libhal_ctx_free( ctx ); - dbus_error_free( &error ); - return; - } - libhal_ctx_set_dbus_connection( ctx, p_connection ); - if( libhal_ctx_init( ctx, &error ) ) - { - if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) ) - { - for( i = 0; i < i_devices; i++ ) - { - if( !libhal_device_property_exists( ctx, devices[i], - "storage.cdrom.dvd", NULL ) ) - { - continue; - } - b_dvd = libhal_device_get_property_bool( ctx, devices[ i ], - "storage.cdrom.dvd", NULL ); - block_dev = libhal_device_get_property_string( ctx, - devices[ i ], "block.device" , NULL ); - if( b_dvd ) - { - config_PutPsz( p_vlc, "dvd", block_dev ); - } - - config_PutPsz( p_vlc, "vcd", block_dev ); - config_PutPsz( p_vlc, "cd-audio", block_dev ); - libhal_free_string( block_dev ); - } - libhal_free_string_array( devices ); - } - libhal_ctx_shutdown( ctx, NULL ); - dbus_connection_unref( p_connection ); - libhal_ctx_free( ctx ); - } - else - { - msg_Warn( p_vlc, "Unable to get HAL device properties" ); - } -#else - (void)p_vlc; -#endif /* HAVE_HAL */ -}