X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=fbe9ccf0f6ae30c6b9c1a8e3154ef8d86783f839;hb=f0040526943e9b664ffcd8f3ed551f1029fe2dc5;hp=276e1205e8b5e1f7e44075e7b1c4b1565c0e38c6;hpb=d672542925904f94e403021e5d3db6c8e73d928f;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 276e1205e8..fbe9ccf0f6 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -42,7 +42,6 @@ #include "modules/modules.h" #include "config/configuration.h" -#include "interface/interface.h" #include /* ENOMEM */ #include /* sprintf() */ @@ -67,27 +66,24 @@ # include #endif +#ifdef ENABLE_NLS +# include /* bindtextdomain */ +#endif + #ifdef HAVE_DBUS /* used for one-instance mode */ # include #endif -#ifdef HAVE_HAL -# include -#endif - #include #include #include #include "audio_output/aout_internal.h" -#include - -#include -#include "stream_output/stream_output.h" - #include +#include +#include #include "libvlc.h" @@ -95,15 +91,117 @@ #include +#ifdef __APPLE__ +# include +#endif + #include /***************************************************************************** * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_int_t * p_static_vlc = NULL; static unsigned i_instances = 0; +#ifndef WIN32 static bool b_daemon = false; +#endif + +#undef vlc_gc_init +#undef vlc_hold +#undef vlc_release + +/** + * Atomically set the reference count to 1. + * @param p_gc reference counted object + * @param pf_destruct destruction calback + * @return p_gc. + */ +void *vlc_gc_init (gc_object_t *p_gc, void (*pf_destruct) (gc_object_t *)) +{ + /* There is no point in using the GC if there is no destructor... */ + 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 + return p_gc; +} + +/** + * Atomically increment the reference count. + * @param p_gc reference counted object + * @return p_gc. + */ +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 + assert (refs != 1); /* there had to be a reference already */ + return p_gc; +} + +/** + * Atomically decrement the reference count and, if it reaches zero, destroy. + * @param p_gc reference counted object. + */ +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 + + assert (refs != (uintptr_t)(-1)); /* reference underflow?! */ + if (refs == 0) + { +#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) +#elif defined (WIN32) && defined (__GNUC__) +#elif defined(__APPLE__) +#else + vlc_spin_destroy (&p_gc->spin); +#endif + p_gc->pf_destructor (p_gc); + } +} /***************************************************************************** * Local prototypes @@ -115,7 +213,7 @@ static void SetLanguage ( char const * ); 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 Usage ( libvlc_int_t *, char const *psz_search ); static void ListModules ( libvlc_int_t *, bool ); static void Version ( void ); @@ -125,10 +223,7 @@ static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); -static int VerboseCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - -static void InitDeviceValues( libvlc_int_t * ); +static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; /** * Allocate a libvlc instance, initialize global data if needed @@ -140,39 +235,30 @@ libvlc_int_t * libvlc_InternalCreate( void ) libvlc_priv_t *priv; char *psz_env = NULL; - /* vlc_threads_init *must* be the first internal call! No other call is - * allowed before the thread system has been initialized. */ - if (vlc_threads_init ()) - return NULL; - - libvlc_global_data_t *p_libvlc_global = vlc_global(); /* Now that the thread system is initialized, we don't have much, but * at least we have variables */ - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + vlc_mutex_lock( &global_lock ); if( i_instances == 0 ) { /* Guess what CPU we have */ cpu_flags = CPUCapabilities(); - /* The module bank will be initialized later */ - p_libvlc_global->p_module_bank = NULL; + /* The module bank will be initialized later */ } /* Allocate a libvlc instance object */ - p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), - sizeof (*p_libvlc) + sizeof (libvlc_priv_t), - VLC_OBJECT_LIBVLC, "libvlc" ); + p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), + VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); if( p_libvlc == NULL ) return NULL; priv = libvlc_priv (p_libvlc); priv->p_playlist = NULL; - priv->p_interaction = NULL; + priv->p_dialog_provider = NULL; priv->p_vlm = NULL; - p_libvlc->psz_object_name = strdup( "libvlc" ); /* Initialize message queue */ msg_Create( p_libvlc ); @@ -189,20 +275,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->b_color = false; #endif - /* Announce who we are - Do it only for first instance ? */ - msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); - /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); - vlc_mutex_init( &priv->config_lock ); - - priv->threads_count = 0; - vlc_mutex_init (&priv->threads_lock); - vlc_cond_init (NULL, &priv->threads_wait); - - /* Store data for the non-reentrant API */ - p_static_vlc = p_libvlc; + vlc_cond_init( &priv->exiting ); return p_libvlc; } @@ -218,9 +293,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, const char *ppsz_argv[] ) { - libvlc_global_data_t *p_libvlc_global = vlc_global(); libvlc_priv_t *priv = libvlc_priv (p_libvlc); - char p_capabilities[200]; char * p_tmp = NULL; char * psz_modules = NULL; char * psz_parser = NULL; @@ -228,7 +301,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__) @@ -239,26 +312,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* System specific initialization code */ system_Init( p_libvlc, &i_argc, ppsz_argv ); - /* Get the executable name (similar to the basename command) */ - if( i_argc > 0 && ppsz_argv[0][0] ) - { - free( p_libvlc->psz_object_name ); - - const char *psz_exe = strrchr( ppsz_argv[0], '/' ); - if( psz_exe && *(psz_exe + 1) ) - p_libvlc->psz_object_name = strdup( psz_exe + 1 ); - else - p_libvlc->psz_object_name = strdup( ppsz_argv[0] ); - } - /* * Support for gettext */ LoadMessages (); - /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ - msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - /* 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 * a short help if required by the user. (short help == main module @@ -267,15 +325,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, false ); return VLC_EGENERIC; } -#ifdef __APPLE__ - /* vlc_thread_set_priority needs to query the config, - * so this is the earliest moment where we can set this */ - vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW ); -#endif + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was 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 ) @@ -292,17 +351,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, i_ret = VLC_EEXITSUCCESS; } - /* Set the config file stuff */ - priv->psz_configfile = config_GetCustomConfigFile( p_libvlc ); - /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) - { - p_libvlc_global->p_module_bank->b_cache_delete = true; - } - - /* Will be re-done properly later on */ - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; /* Check for daemon mode */ #ifndef WIN32 @@ -319,7 +369,7 @@ 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; @@ -371,7 +421,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, false ); return i_ret; } @@ -385,25 +435,24 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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" ); /* 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" ) ) { - bool b_cache_delete = p_libvlc_global->p_module_bank->b_cache_delete; - /* 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 ); + 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 ); - p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete; + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); } free( psz_language ); # endif @@ -415,24 +464,40 @@ 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_LoadBuiltins( p_libvlc ); - module_LoadPlugins( p_libvlc ); + module_LoadPlugins( p_libvlc, b_cache_delete ); if( p_libvlc->b_die ) { b_exit = true; } - msg_Dbg( p_libvlc, "module bank initialized, found %i modules", - vlc_internals( p_libvlc_global->p_module_bank )->i_children ); + size_t module_count; + module_t **list = module_list_get( &module_count ); + module_list_free( list ); + msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); + 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."); + abort(); + } /* Check for help on modules */ - if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) + if( (p_tmp = var_CreateGetNonEmptyString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } + /* Check for full help option */ + else if( config_GetInt( p_libvlc, "full-help" ) > 0 ) + { + config_PutInt( p_libvlc, "advanced", 1); + config_PutInt( p_libvlc, "help-verbose", 1); + 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 ) { @@ -473,15 +538,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return i_ret; } - /* - * Init device values - */ - InitDeviceValues( p_libvlc ); - /* * Override default configuration with config file settings */ @@ -500,9 +560,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, "that they are valid.\n" ); PauseConsole(); #endif - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* * System specific configuration @@ -513,7 +574,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_DBUS dbus_threads_init_default(); - if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) + 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" ) ) ) { /* Initialise D-Bus interface, check for other instances */ DBusConnection *p_conn = NULL; @@ -573,7 +636,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 */ @@ -583,7 +646,7 @@ 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 ) @@ -593,7 +656,7 @@ 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 ); } /* send message and get a handle for a reply */ @@ -603,7 +666,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 ) @@ -611,7 +674,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 ); @@ -622,7 +685,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 */ @@ -633,26 +696,52 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ + char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" ); + if( psz_verbose_objects ) + { + char * psz_object, * iter = psz_verbose_objects; + while( (psz_object = strsep( &iter, "," )) ) + { + switch( psz_object[0] ) + { + printf("%s\n", psz_object+1); + case '+': msg_EnableObjectPrinting(p_libvlc, psz_object+1); break; + case '-': msg_DisableObjectPrinting(p_libvlc, psz_object+1); break; + default: + msg_Err( p_libvlc, "verbose-objects usage: \n" + "--verbose-objects=+printthatobject," + "-dontprintthatone\n" + "(keyword 'all' to applies to all objects)"); + free( psz_verbose_objects ); + /* FIXME: leaks!!!! */ + return VLC_EGENERIC; + } + } + free( psz_verbose_objects ); + } + /* 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 ) { - val.i_int = -1; - var_Set( p_libvlc, "verbose", val ); + var_SetInteger( p_libvlc, "verbose", -1 ); + priv->i_verbose = -1; } - var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); - var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); + vlc_threads_setup( p_libvlc ); if( priv->b_color ) priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; - /* - * Output messages that may still be in the queue - */ - msg_Flush( p_libvlc ); - - if( !config_GetInt( p_libvlc, "fpu" ) ) - cpu_flags &= ~CPU_CAPABILITY_FPU; + char p_capabilities[200]; +#define PRINT_CAPABILITY( capability, string ) \ + if( vlc_CPU() & capability ) \ + { \ + strncat( p_capabilities, string " ", \ + sizeof(p_capabilities) - strlen(p_capabilities) ); \ + p_capabilities[sizeof(p_capabilities) - 1] = '\0'; \ + } + p_capabilities[0] = '\0'; #if defined( __i386__ ) || defined( __x86_64__ ) if( !config_GetInt( p_libvlc, "mmx" ) ) @@ -665,96 +754,116 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 + if( !config_GetInt( p_libvlc, "sse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE3; + if( !config_GetInt( p_libvlc, "ssse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSSE3; + if( !config_GetInt( p_libvlc, "sse41" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_1; + if( !config_GetInt( p_libvlc, "sse42" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_2; -#define PRINT_CAPABILITY( capability, string ) \ - if( vlc_CPU() & capability ) \ - { \ - strncat( p_capabilities, string " ", \ - 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" ); 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_SSE3, "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( !config_GetInt( p_libvlc, "altivec" ) ) + cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; + PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" ); - PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" ); + +#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 + 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", 0 ); + 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->i_timers = 0; priv->pp_timers = NULL; - /* Init stats */ - p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) ); - if( !p_libvlc->p_stats ) - { - vlc_object_release( p_libvlc ); - return VLC_ENOMEM; - } - vlc_mutex_init( &p_libvlc->p_stats->lock ); - priv->p_stats_computer = NULL; - - /* Init the array that holds every input item */ - ARRAY_INIT( priv->input_items ); - priv->i_last_input_id = 0; + priv->i_last_input_id = 0; /* Not very safe, should be removed */ /* * 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 ); + { + struct hotkey *p_keys = + malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) ); + + /* Initialize from configuration */ + for( size_t i = 0; i < libvlc_actions_count; i++ ) + { + p_keys[i].psz_action = libvlc_actions[i].name; + p_keys[i].i_key = config_GetInt( p_libvlc, + libvlc_actions[i].name ); + p_keys[i].i_action = libvlc_actions[i].value; + } + p_keys[libvlc_actions_count].psz_action = NULL; + p_keys[libvlc_actions_count].i_key = 0; + p_keys[libvlc_actions_count].i_action = 0; + p_libvlc->p_hotkeys = p_keys; + var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, + p_keys ); + } - /* Initialize interaction */ - priv->p_interaction = interaction_Init( p_libvlc ); + /* 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 ); /* Initialize playlist and get commandline files */ - playlist_ThreadCreate( p_libvlc ); - if( !priv->p_playlist ) + p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); + if( !p_playlist ) { msg_Err( p_libvlc, "playlist initialization failed" ); if( priv->p_memcpy_module != NULL ) { - module_Unneed( p_libvlc, priv->p_memcpy_module ); + module_unneed( p_libvlc, priv->p_memcpy_module ); } - module_EndBank( p_libvlc ); + module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } - p_playlist = priv->p_playlist; + playlist_Activate( p_playlist ); + vlc_object_attach( p_playlist, p_libvlc ); - psz_modules = config_GetPsz( p_playlist, "services-discovery" ); - if( psz_modules && *psz_modules ) + /* Add service discovery modules */ + psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" ); + if( psz_modules ) { - /* Add service discovery modules */ - playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); + char *p = psz_modules, *m; + while( ( m = strsep( &p, " :," ) ) != NULL ) + playlist_ServicesDiscoveryAdd( p_playlist, m ); } free( psz_modules ); -#ifdef ENABLE_SOUT +#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 ) @@ -766,16 +875,23 @@ 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" ); + /* Create volume callback system. (this variable must be created before + all interfaces as they can use it) */ + var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); - if( psz_modules && *psz_modules && psz_control && *psz_control ) + psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); + psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); + + if( psz_modules && psz_control ) { - psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) + - strlen( psz_control ) + 1 ); - sprintf( psz_modules, "%s:%s", psz_modules, psz_control ); + char* psz_tmp; + if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) + { + free( psz_modules ); + psz_modules = psz_tmp; + } } - else if( psz_control && *psz_control ) + else if( psz_control ) { free( psz_modules ); psz_modules = strdup( psz_control ); @@ -792,11 +908,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, *psz_parser = '\0'; psz_parser++; } - psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") ); - if( psz_temp ) + if( asprintf( &psz_temp, "%s,none", psz_module ) != -1) { - sprintf( psz_temp, "%s,none", psz_module ); - libvlc_InternalAddIntf( p_libvlc, psz_temp ); + intf_Create( p_libvlc, psz_temp ); free( psz_temp ); } } @@ -806,41 +920,35 @@ 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" ); + 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 ) - libvlc_InternalAddIntf( p_libvlc, "dbus,none" ); + 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" ) ) ) + 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" ); - } + intf_Create( p_libvlc, "inhibit,none" ); +# endif #endif - if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) + if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && + !config_GetInt( 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 ) { char *logmode = var_CreateGetString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); - libvlc_InternalAddIntf( p_libvlc, "logger,none" ); + intf_Create( p_libvlc, "logger,none" ); if( logmode ) { @@ -852,40 +960,30 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #endif - if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) - { - libvlc_InternalAddIntf( p_libvlc, "showintf,none" ); - } - if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { - libvlc_InternalAddIntf( p_libvlc, "netsync,none" ); + intf_Create( p_libvlc, "netsync,none" ); } #ifdef WIN32 if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { - char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" ); if( psz_codecs ) { char *psz_morecodecs; - asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs); - if( psz_morecodecs ) + if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", 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,quicktime"); } #endif - /* - * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin - */ - var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER ); 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 ); @@ -895,13 +993,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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). */ + /* Create a variable for showing the fullscreen interface from hotkeys */ 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 ); /* @@ -912,16 +1009,15 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * 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_CreateGetString( p_libvlc, "open" ); + if ( psz_val != NULL && *psz_val ) { - playlist_t *p_playlist = pl_Yield( p_libvlc ); - playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, - -1, NULL, 0, true, false ); + playlist_t *p_playlist = pl_Hold( p_libvlc ); + playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0, + -1, 0, NULL, 0, true, pl_Unlocked ); pl_Release( p_libvlc ); } - free( val.psz_string ); + free( psz_val ); return VLC_SUCCESS; } @@ -930,22 +1026,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * Cleanup a libvlc instance. The instance is not completely deallocated * \param p_libvlc the instance to clean */ -int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) +void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { - intf_thread_t * p_intf = NULL; - libvlc_priv_t *priv = libvlc_priv (p_libvlc); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + playlist_t *p_playlist = priv->p_playlist; + + /* Deactivate the playlist */ + msg_Dbg( p_libvlc, "deactivating the playlist" ); + playlist_Deactivate( p_playlist ); + + /* Remove all services discovery */ + msg_Dbg( p_libvlc, "removing all services discovery tasks" ); + playlist_ServicesDiscoveryKillAll( p_playlist ); /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); - 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_SOUT +#ifdef ENABLE_VLM /* Destroy VLM if created in libvlc_InternalInit */ if( priv->p_vlm ) { @@ -953,94 +1052,26 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - playlist_t *p_playlist = priv->p_playlist; - /* Remove all services discovery */ - msg_Dbg( p_libvlc, "removing all services discovery tasks" ); - playlist_ServicesDiscoveryKillAll( p_playlist ); - /* Free playlist */ - /* Any thread still running must not assume pl_Yield() succeeds. */ + /* Any thread still running must not assume pl_Hold() succeeds. */ msg_Dbg( p_libvlc, "removing playlist" ); - priv->p_playlist = NULL; - vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Yield() */ - vlc_thread_join( p_playlist ); - vlc_object_release( p_playlist ); - /* Free interaction */ - msg_Dbg( p_libvlc, "removing interaction" ); - interaction_Destroy( priv->p_interaction ); + libvlc_priv(p_libvlc)->p_playlist = NULL; + barrier(); /* FIXME is that correct ? */ - /* Free video outputs */ - msg_Dbg( p_libvlc, "removing all video outputs" ); - vlc_list_t *list = vlc_list_find (p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD); - for (int i = 0; i < list->i_count; i++) - vlc_object_release (list->p_values[i].p_object); - vlc_list_release (list); + vlc_object_release( p_playlist ); stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); -#ifdef ENABLE_SOUT - announce_handler_t * p_announce; - - /* Free announce handler(s?) */ - while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE, - FIND_CHILD ) ) ) - { - msg_Dbg( p_libvlc, "removing announce handler" ); - vlc_object_detach( p_announce ); - vlc_object_release( p_announce ); - announce_HandlerDestroy( p_announce ); - } -#endif - - /* Make sure all threads are completed before we start looking for - * reference leaks and deinitializing core LibVLC subsytems. */ - vlc_mutex_lock (&priv->threads_lock); - while (priv->threads_count) - { - msg_Dbg (p_libvlc, "waiting for %u remaining threads", - priv->threads_count); - vlc_cond_wait (&priv->threads_wait, &priv->threads_lock); - } - vlc_mutex_unlock (&priv->threads_lock); - - bool b_clean = true; - FOREACH_ARRAY( input_item_t *p_del, priv->input_items ) - msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s", - p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" ); - b_clean = false; - FOREACH_END(); - assert( b_clean ); - ARRAY_RESET( priv->input_items ); - msg_Dbg( p_libvlc, "removing stats" ); - vlc_mutex_destroy( &p_libvlc->p_stats->lock ); - FREENULL( p_libvlc->p_stats ); - - return VLC_SUCCESS; -} - -/** - * Destroy everything. - * This function requests the running threads to finish, waits for their - * termination, and destroys their structure. - * It stops the thread systems: no instance can run after this has run - * \param p_libvlc the instance to destroy - */ -int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) -{ - if( !p_libvlc ) - return VLC_EGENERIC; - - libvlc_priv_t *priv = libvlc_priv (p_libvlc); #ifndef WIN32 char* psz_pidfile = NULL; 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 ); @@ -1056,19 +1087,30 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) if( priv->p_memcpy_module ) { - module_Unneed( p_libvlc, priv->p_memcpy_module ); + module_unneed( p_libvlc, priv->p_memcpy_module ); priv->p_memcpy_module = NULL; } /* Free module bank. It is refcounted, so we call this each time */ - module_EndBank( p_libvlc ); + 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 ); + (void *)p_libvlc->p_hotkeys ); + free( (void *)p_libvlc->p_hotkeys ); +} - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); +/** + * Destroy everything. + * This function requests the running threads to finish, waits for their + * termination, and destroys their structure. + * It stops the thread systems: no instance can run after this has run + * \param p_libvlc the instance to destroy + */ +void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + + vlc_mutex_lock( &global_lock ); i_instances--; if( i_instances == 0 ) @@ -1076,26 +1118,22 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) /* System specific cleaning code */ system_End( p_libvlc ); } - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); - msg_Flush( p_libvlc ); msg_Destroy( p_libvlc ); /* Destroy mutexes */ - vlc_mutex_destroy( &priv->config_lock ); + vlc_cond_destroy( &priv->exiting ); vlc_mutex_destroy( &priv->timer_lock ); - vlc_cond_destroy (&priv->threads_wait); - vlc_mutex_destroy (&priv->threads_lock); - - vlc_object_release( p_libvlc ); - p_libvlc = NULL; - /* Stop thread system: last one out please shut the door! - * The number of initializations of the thread system is counted, we - * can call this each time */ - vlc_threads_end (); +#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 - return VLC_SUCCESS; + assert( vlc_internals( p_libvlc )->i_refcount == 1 ); + vlc_object_release( p_libvlc ); } /** @@ -1103,16 +1141,13 @@ int 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 ) @@ -1121,31 +1156,51 @@ 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 ); } /* 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; - } + psz_module ? psz_module : "default" ); + var_Destroy( p_libvlc, "intf" ); + return ret; +} - /* 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; - } +static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; - return VLC_SUCCESS; -}; +/** + * 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 ); +} #if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) @@ -1188,8 +1243,8 @@ static inline int LoadMessages (void) static const char psz_path[] = LOCALEDIR; #else char psz_path[1024]; - if (snprintf (psz_path, sizeof (psz_path), "%s/%s", - vlc_global()->psz_vlcpath, "locale") + if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", + config_GetDataDir(), "locale") >= (int)sizeof (psz_path)) return -1; @@ -1247,12 +1302,16 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ /* TODO: write an internal function of this one, to avoid * unnecessary lookups. */ + char *mrl = make_URI( ppsz_argv[i_opt] ); + if( !mrl ) + continue; - playlist_t *p_playlist = pl_Yield( p_vlc ); - playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT, - 0, -1, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), - i_options, true, false ); + playlist_t *p_playlist = pl_Hold( p_vlc ); + playlist_AddExt( p_playlist, mrl, 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 ); + free( mrl ); } return VLC_SUCCESS; @@ -1263,6 +1322,44 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ ***************************************************************************** * Print a short inline help. Message interface is initialized at this stage. *****************************************************************************/ +static inline void print_help_on_full_help( void ) +{ + utf8_fprintf( stdout, "\n" ); + 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 @@ -1271,13 +1368,20 @@ 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 ); - Usage( p_this, "help" ); - Usage( p_this, "main" ); + utf8_fprintf( stdout, vlc_usage, "vlc" ); + Usage( p_this, "=help" ); + Usage( p_this, "=main" ); + print_help_on_full_help(); } 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, "vlc" ); + Usage( p_this, NULL ); + print_help_on_full_help(); + } + else if( psz_help_name && !strcmp( psz_help_name, "full-help" ) ) + { + utf8_fprintf( stdout, vlc_usage, "vlc" ); Usage( p_this, NULL ); } else if( psz_help_name ) @@ -1295,7 +1399,34 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) ***************************************************************************** * Print a short inline help. Message interface is initialized at this stage. *****************************************************************************/ -static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) +# 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(0) +# define GRAY "\033[0m" +static void print_help_section( 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 ) ); + 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 ) ); + } +} + +static void Usage( libvlc_int_t *p_this, char const *psz_search ) { #define FORMAT_STRING " %s --%s%s%s%s%s%s%s " /* short option ------' | | | | | | | @@ -1310,15 +1441,6 @@ 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(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) @@ -1329,14 +1451,12 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) #else # define OPTION_VALUE_SEP " " #endif - 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(COLOR_FORMAT_STRING)]; char psz_format_bool[sizeof(COLOR_FORMAT_STRING_BOOL)]; char psz_buffer[10000]; char psz_short[4]; - int i_index; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; @@ -1344,6 +1464,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) bool b_description_hack; bool b_color = config_GetInt( p_this, "color" ) > 0; bool b_has_advanced = false; + bool b_found = false; + int i_only_advanced = 0; /* Number of modules ignored because they + * only have advanced options */ + bool b_strict = psz_search && *psz_search == '='; + if( b_strict ) psz_search++; memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START ); psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; @@ -1366,28 +1491,33 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } /* List all modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + module_t **list = module_list_get (NULL); + if (!list) + return; /* Ugly hack to make sure that the help options always come first * (part 1) */ - if( !psz_module_name ) + if( !psz_search ) Usage( p_this, "help" ); /* Enumerate the config for each module */ - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + for (size_t i = 0; list[i]; i++) { bool b_help_module; - module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; + module_t *p_parser = list[i]; module_config_t *p_item = NULL; + module_config_t *p_section = 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 ) ) + if( 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 ) { - if( !strcmp( psz_module_name, *pp_shortcut ) ) + if( b_strict ? !strcmp( psz_search, *pp_shortcut ) + : !!strstr( *pp_shortcut, psz_search ) ) break; pp_shortcut ++; } @@ -1404,7 +1534,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) 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 ) + if( !psz_search && b_help_module ) continue; /* Ignore modules with only advanced config options if requested */ @@ -1415,25 +1545,35 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) p_item++ ) { if( (p_item->i_type & CONFIG_ITEM) && - !p_item->b_advanced ) break; + !p_item->b_advanced && !p_item->b_removed ) break; + } + + if( p_item == p_end ) + { + i_only_advanced++; + continue; } } + b_found = true; + /* Print name of module */ if( strcmp( "main", p_parser->psz_object_name ) ) { if( b_color ) - utf8_fprintf( stdout, "\n " GREEN "%s" GRAY "\n", - p_parser->psz_longname ); + utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n", + _( 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", _( 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, + _( p_parser->psz_help ) ); else - utf8_fprintf( stdout, " %s\n", p_parser->psz_help ); + utf8_fprintf( stdout, " %s\n", _( p_parser->psz_help ) ); } /* Print module options */ @@ -1467,38 +1607,27 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) { if( b_color ) utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, - p_item->psz_text ); + _( p_item->psz_text ) ); else - utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + 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 ); + _( p_item->psz_longtext ) ); else - utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + utf8_fprintf( stdout, " %s\n", + _( p_item->psz_longtext ) ); } break; case CONFIG_HINT_SUBCATEGORY: if( strcmp( "main", p_parser->psz_object_name ) ) - break; + 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 ); - } + p_section = p_item; break; case CONFIG_ITEM_STRING: @@ -1510,6 +1639,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_ITEM_MODULE_LIST_CAT: case CONFIG_ITEM_FONT: case CONFIG_ITEM_PASSWORD: + print_help_section( p_section, b_color, b_description ); + p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("string"); psz_ket = ">"; @@ -1529,6 +1660,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) 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 ); + p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("integer"); psz_ket = ">"; @@ -1550,12 +1683,14 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( i ) strcat( psz_buffer, ", " ); sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], - p_item->ppsz_list_text[i] ); + _( p_item->ppsz_list_text[i] ) ); } psz_ket = "}"; } break; case CONFIG_ITEM_FLOAT: + print_help_section( p_section, b_color, b_description ); + p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("float"); psz_ket = ">"; @@ -1567,6 +1702,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } break; case CONFIG_ITEM_BOOL: + print_help_section( p_section, b_color, b_description ); + p_section = NULL; psz_bra = ""; psz_type = ""; psz_ket = ""; if( !b_help_module ) { @@ -1613,7 +1750,7 @@ 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_bool, psz_short, + 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 ); } @@ -1626,7 +1763,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) 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", _( p_item->psz_text ), + psz_suf ); b_description_hack = b_description; description: @@ -1718,7 +1856,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( b_description_hack && p_item->psz_longtext ) { - sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); + sprintf( psz_buffer, "%s%s", _( p_item->psz_longtext ), + psz_suf ); b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); @@ -1727,18 +1866,43 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } } - if( b_has_advanced ) + if( b_has_advanced ) { if( b_color ) utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ), _( "add --advanced to your command line to see advanced options.")); else - utf8_fprintf( stdout, "\n %s %s\n", _( "Note:" ), + utf8_fprintf( stdout, "\n%s %s\n", _( "Note:" ), _( "add --advanced to your command line to see advanced options.")); } + if( i_only_advanced > 0 ) + { + if( b_color ) + { + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " ", _( "Note:" ) ); + utf8_fprintf( stdout, _( "%d module(s) were not displayed because they only have advanced options.\n" ), i_only_advanced ); + } + else + { + utf8_fprintf( stdout, "\n%s ", _( "Note:" ) ); + utf8_fprintf( stdout, _( "%d module(s) were not displayed because they only have advanced options.\n" ), i_only_advanced ); + } + } + else if( !b_found ) + { + if( b_color ) + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY "\n", + _( "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 " \ + "--list-verbose to list available modules." ) ); + } + /* Release the module list */ - vlc_list_release( p_list ); + module_list_free (list); } /***************************************************************************** @@ -1749,44 +1913,28 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) *****************************************************************************/ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { - vlc_list_t *p_list = NULL; - module_t *p_parser = NULL; - char psz_spaces[22]; - int i_index; + module_t *p_parser; bool b_color = config_GetInt( p_this, "color" ) > 0; - memset( psz_spaces, ' ', 22 ); - #ifdef WIN32 ShowConsole( true ); #endif /* List all modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + module_t **list = module_list_get (NULL); /* Enumerate each module */ - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { - int i; - - p_parser = (module_t *)p_list->p_values[i_index].p_object ; - - /* 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 ); + _( 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 ); + _( p_parser->psz_longname ) ); if( b_verbose ) { @@ -1816,11 +1964,8 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) p_parser->i_score ); } } - - psz_spaces[i] = ' '; } - - vlc_list_release( p_list ); + module_list_free (list); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -1834,18 +1979,17 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) *****************************************************************************/ static void Version( void ) { + extern const char psz_vlc_changeset[]; #ifdef WIN32 ShowConsole( true ); #endif - utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); + utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(), + psz_vlc_changeset ); utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); - if( strcmp( VLC_Changeset(), "exported" ) ) - utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"), - VLC_Changeset() ); - utf8_fprintf( stdout, LICENSE_MSG ); + utf8_fprintf( stdout, "%s", LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); @@ -1925,7 +2069,7 @@ static int ConsoleWidth( void ) i_width = 80; pclose( file ); } -#else +#elif !defined (UNDER_CE) CONSOLE_SCREEN_BUFFER_INFO buf; if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) @@ -1935,84 +2079,14 @@ static int ConsoleWidth( void ) return i_width; } -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 ) - { - libvlc_priv (p_libvlc)->i_verbose = __MIN( new_val.i_int, 2 ); - } - return VLC_SUCCESS; -} +#include -/***************************************************************************** - * InitDeviceValues: initialize device values - ***************************************************************************** - * This function inits the dvd, vcd and cd-audio values - *****************************************************************************/ -static void InitDeviceValues( libvlc_int_t *p_vlc ) +void vlc_avcodec_mutex (bool acquire) { -#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 ); - } + static vlc_mutex_t lock = VLC_STATIC_MUTEX; - 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 ); - } + if (acquire) + vlc_mutex_lock (&lock); else - { - msg_Warn( p_vlc, "Unable to get HAL device properties" ); - } -#else - (void)p_vlc; -#endif /* HAVE_HAL */ + vlc_mutex_unlock (&lock); }