#include "audio_output/aout_internal.h"
#include <vlc_vout.h>
-
#include <vlc_sout.h>
-#include "stream_output/stream_output.h"
-
#include <vlc_charset.h>
#include "libvlc.h"
#include <vlc_vlm.h>
+#ifdef __APPLE__
+# include <libkern/OSAtomic.h>
+#endif
+
#include <assert.h>
/*****************************************************************************
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 );
+
+#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;
+}
+
+/**
+ * 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 );
+
+#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
+
+ 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);
+ }
+}
/*****************************************************************************
* Local prototypes
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 );
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" );
{
/* 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 */
+ p_module_bank = NULL;
}
/* 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 );
#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 */
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;
/* 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
*/
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
-
/* Check for short help option */
if( config_GetInt( p_libvlc, "help" ) > 0 )
{
/* Check for plugins cache options */
if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 )
{
- p_libvlc_global->p_module_bank->b_cache_delete = true;
+ p_module_bank->b_cache_delete = true;
}
/* Will be re-done properly later on */
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;
+ bool b_cache_delete = p_module_bank->b_cache_delete;
/* Reset the default domain */
SetLanguage( psz_language );
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;
+ p_module_bank->b_cache_delete = b_cache_delete;
}
free( psz_language );
# endif
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" )) )
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 )
{
#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;
if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
{
- msg_Err( p_libvlc, "Out of memory" );
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
exit( VLC_ENOMEM );
if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_BOOLEAN, &b_play ) )
{
- msg_Err( p_libvlc, "Out of memory" );
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
exit( VLC_ENOMEM );
/*
* 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 )
/*
* 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;
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
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;
}
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 )
#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
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 );
var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
/* Create a variable for showing the interface (moved from playlist). */
- var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
- var_SetBool( p_playlist, "intf-show", true );
+ 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 );
/*
* Get input filenames given as commandline arguments
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, false );
+ -1, NULL, 0, true, pl_Unlocked );
pl_Release( p_libvlc );
}
free( val.psz_string );
int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
intf_thread_t * p_intf = NULL;
- vout_thread_t * p_vout = NULL;
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
/* Ask the interfaces to stop and destroy them */
vlc_object_release( p_intf ); /* for vlc_object_find() */
}
-#ifdef ENABLE_SOUT
- playlist_t * p_playlist;
- sout_instance_t * p_sout;
-
- p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
- if( p_playlist )
- {
- p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
- if( p_sout )
- {
- msg_Dbg( p_sout, "removing kept stream output" );
- vlc_object_detach( (vlc_object_t*)p_sout );
- vlc_object_release( (vlc_object_t*)p_sout );
- sout_DeleteInstance( p_sout );
- }
-
- vlc_object_release( p_playlist );
- }
-
+#ifdef ENABLE_VLM
/* Destroy VLM if created in libvlc_InternalInit */
if( priv->p_vlm )
{
}
#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_Hold() succeeds. */
msg_Dbg( p_libvlc, "removing playlist" );
- vlc_object_release( priv->p_playlist );
+ priv->p_playlist = NULL;
+ vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Hold() */
+ vlc_thread_join( p_playlist );
+ vlc_object_release( p_playlist );
/* Free interaction */
msg_Dbg( p_libvlc, "removing interaction" );
- vlc_object_release( priv->p_interaction );
+ interaction_Destroy( priv->p_interaction );
/* Free video outputs */
msg_Dbg( p_libvlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vlc_object_release( p_vout );
- }
+ 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);
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
-
- 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 );
* 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
- * \param b_release whether we should do a release on the instance
*/
-int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
+int libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
{
if( !p_libvlc )
return VLC_EGENERIC;
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;
}
vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock );
- if( b_release ) vlc_object_release( p_libvlc );
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;
}
}
/* Try to run the interface */
- p_intf->b_play = false; /* TODO: remove b_play completely */
i_err = intf_RunThread( p_intf );
if( i_err )
{
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;
/* 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, false );
+ i_options, true, pl_Unlocked );
pl_Release( p_vlc );
}
*****************************************************************************
* 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 void Help( libvlc_int_t *p_this, char const *psz_help_name )
{
#ifdef WIN32
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 )
*****************************************************************************
* 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 ------' | | | | | | |
* 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)
#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;
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';
memset( psz_spaces_longtext, ' ', LINE_START+2 );
psz_spaces_longtext[LINE_START+2] = '\0';
-#ifdef WIN32
- b_color = false; // don't put color control codes in a .txt file
+#ifndef WIN32
+ if( !isatty( 1 ) )
#endif
+ b_color = false; // don't put color control codes in a .txt file
if( b_color )
{
}
/* 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 ) ) )
{
- const char *const *pp_shortcut = p_parser->pp_shortcuts;
+ 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 ++;
}
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 */
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 );
}
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:
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 = ">";
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 = ">";
}
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 = ">";
}
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 )
{
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 );
}
}
}
- 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);
}
/*****************************************************************************
*****************************************************************************/
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;
#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( b_verbose )
{
- const char *const *pp_shortcut = p_parser->pp_shortcuts;
+ char *const *pp_shortcut = p_parser->pp_shortcuts;
while( *pp_shortcut )
{
if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
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();
i_width = 80;
pclose( file );
}
-#else
+#elif !defined (UNDER_CE)
CONSOLE_SCREEN_BUFFER_INFO buf;
if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf))
projects / vlc / blobdiff