X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=d6e6be4efc792681a9a6ed1c1f438b664032ec3d;hb=96d708c2768aa9ee43b4d48957f8f85c68f016de;hp=842aa7270b95c376e8dec51088184c9f8476348d;hpb=35824733e305214dfada18dd6362cfa02a86dcd3;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 842aa7270b..d6e6be4efc 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -83,10 +83,7 @@ #include "audio_output/aout_internal.h" #include - #include -#include "stream_output/stream_output.h" - #include #include "libvlc.h" @@ -95,6 +92,10 @@ #include +#ifdef __APPLE__ +# include +#endif + #include /***************************************************************************** @@ -103,43 +104,105 @@ static libvlc_int_t * p_static_vlc = NULL; static unsigned i_instances = 0; +#ifndef WIN32 static bool b_daemon = false; +#endif -/***************************************************************************** - * vlc_gc_*. - *****************************************************************************/ -void __vlc_gc_incref( gc_object_t * p_gc ) +#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 *)) { - assert( p_gc->i_gc_refcount > 0 ); + /* 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; +} - /* FIXME: atomic version needed! */ - p_gc->i_gc_refcount ++; +/** + * 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 ); + +#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + refs = __sync_add_and_fetch (&p_gc->refs, 1); +#elif defined (WIN32) && defined (__GNUC__) + refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, + InterlockedIncrement (&p_gc->refs), + InterlockedIncrement64 (&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; } -void __vlc_gc_decref( gc_object_t *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( p_gc->i_gc_refcount > 0 ); - /* FIXME: atomic version needed! */ - p_gc->i_gc_refcount -- ; +#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + refs = __sync_sub_and_fetch (&p_gc->refs, 1); +#elif defined (WIN32) && defined (__GNUC__) + refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, + InterlockedDecrement (&p_gc->refs), + InterlockedDecrement64 (&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 - if( p_gc->i_gc_refcount == 0 ) + assert (refs != (uintptr_t)(-1)); /* reference underflow?! */ + if (refs == 0) { - p_gc->pf_destructor( p_gc ); - /* Do not use the p_gc pointer from now on ! */ +#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); } } -void -__vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ), - void * arg) -{ - p_gc->i_gc_refcount = 1; - p_gc->pf_destructor = pf_destructor; - p_gc->p_destructor_arg = arg; -} - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -150,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 ); @@ -165,6 +228,8 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); +static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; + /** * Allocate a libvlc instance, initialize global data if needed * It also initializes the threading system @@ -175,30 +240,22 @@ 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; @@ -225,17 +282,13 @@ libvlc_int_t * libvlc_InternalCreate( void ) #endif /* Announce who we are - Do it only for first instance ? */ - msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "%s", 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; @@ -253,7 +306,6 @@ 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; @@ -274,18 +326,6 @@ 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 */ @@ -325,10 +365,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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; - } + bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; /* Will be re-done properly later on */ priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); @@ -419,8 +456,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, psz_language = config_GetPsz( p_libvlc, "language" ); if( psz_language && *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 ); @@ -432,7 +467,6 @@ 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 ); - p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete; } free( psz_language ); # endif @@ -445,14 +479,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * 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 (%u modules)", module_count ); /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) @@ -551,7 +587,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; @@ -671,6 +709,28 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ + char * psz_verbose_objects = config_GetPsz( 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)\n"); + free( psz_verbose_objects ); + return VLC_EGENERIC; + } + } + free( psz_verbose_objects ); + } var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); if( config_GetInt( p_libvlc, "quiet" ) > 0 ) @@ -684,11 +744,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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; @@ -733,7 +788,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * 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", 0 ); priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; priv->i_timers = 0; @@ -749,9 +804,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 @@ -774,7 +827,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 ); return VLC_EGENERIC; @@ -849,7 +902,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #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 ) + 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" ); /* Prevents the power management daemon from suspending the system @@ -869,7 +924,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #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" ); } @@ -907,8 +963,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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); free( psz_morecodecs ); @@ -954,7 +1009,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_Get( p_libvlc, "open", &val ); if ( val.psz_string != NULL && *val.psz_string ) { - playlist_t *p_playlist = pl_Yield( p_libvlc ); + playlist_t *p_playlist = pl_Hold( p_libvlc ); playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, -1, NULL, 0, true, pl_Unlocked ); pl_Release( p_libvlc ); @@ -997,10 +1052,10 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) 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_object_kill( p_playlist ); /* <-- memory barrier for pl_Hold() */ vlc_thread_join( p_playlist ); vlc_object_release( p_playlist ); @@ -1018,40 +1073,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) 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 ); @@ -1094,7 +1115,7 @@ 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; } @@ -1106,7 +1127,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) p_libvlc->p_hotkeys ); FREENULL( p_libvlc->p_hotkeys ); - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + vlc_mutex_lock( &global_lock ); i_instances--; if( i_instances == 0 ) @@ -1114,25 +1135,17 @@ 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_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 (); - return VLC_SUCCESS; } @@ -1206,7 +1219,10 @@ static void SetLanguage ( const char *psz_lang ) * the language at runtime under eg. Windows. Beware that this * makes the environment unconsistent when libvlc is unloaded and * should probably be moved to a safer place like vlc.c. */ - setenv( "LC_ALL", psz_lang, 1 ); + static char psz_lcall[20]; + snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang ); + psz_lcall[19] = '\0'; + putenv( psz_lcall ); #endif setlocale( LC_ALL, psz_lang ); @@ -1283,7 +1299,7 @@ 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. */ - playlist_t *p_playlist = pl_Yield( p_vlc ); + playlist_t *p_playlist = pl_Hold( 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, pl_Unlocked ); @@ -1312,20 +1328,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, p_this->psz_object_name ); + utf8_fprintf( stdout, vlc_usage, "vlc" ); Usage( p_this, NULL ); } else if( psz_help_name ) @@ -1371,7 +1387,7 @@ static void print_help_section( module_config_t *p_item, bool b_color, bool b_de } } -static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) +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 ------' | | | | | | | @@ -1396,14 +1412,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; @@ -1411,6 +1425,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'; @@ -1433,29 +1452,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 ++; } @@ -1472,7 +1495,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 */ @@ -1483,16 +1506,25 @@ 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 ); } @@ -1676,7 +1708,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 ); } @@ -1790,18 +1822,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); } /***************************************************************************** @@ -1812,10 +1869,8 @@ 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; + module_t *p_parser; char psz_spaces[22]; - int i_index; bool b_color = config_GetInt( p_this, "color" ) > 0; @@ -1826,15 +1881,13 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) #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; @@ -1882,8 +1935,7 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) 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(); @@ -1988,7 +2040,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))