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 )
+{
+ assert( p_gc->i_gc_refcount > 0 );
+
+ /* FIXME: atomic version needed! */
+ p_gc->i_gc_refcount ++;
+}
+
+void __vlc_gc_decref( gc_object_t *p_gc )
+{
+ assert( p_gc );
+ assert( p_gc->i_gc_refcount > 0 );
+
+ /* FIXME: atomic version needed! */
+ p_gc->i_gc_refcount -- ;
+
+ if( p_gc->i_gc_refcount == 0 )
+ {
+ p_gc->pf_destructor( p_gc );
+ /* Do not use the p_gc pointer from now on ! */
+ }
+}
+
+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
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 );
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),
+ p_libvlc = __vlc_custom_create( NULL, sizeof (*priv),
VLC_OBJECT_LIBVLC, "libvlc" );
if( p_libvlc != NULL )
i_instances++;
#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;
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;
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
}
msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
- vlc_internals( p_libvlc_global->p_module_bank )->i_children );
+ vlc_internals( p_module_bank )->i_children );
/* Check for help on modules */
if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
/*
* 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 )
}
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 )
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 );
{
playlist_t *p_playlist = pl_Yield( 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 );
vlc_object_release( p_intf ); /* for vlc_object_find() */
}
-#ifdef ENABLE_SOUT
+#ifdef ENABLE_VLM
/* Destroy VLM if created in libvlc_InternalInit */
if( priv->p_vlm )
{
}
#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",
/* 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;
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;
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 );
+ i_options, true, pl_Unlocked );
pl_Release( p_vlc );
}
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" );
+ Usage( p_this, "=help" );
+ Usage( p_this, "=main" );
print_help_on_full_help();
}
else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
}
}
-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 ------' | | | | | | |
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';
/* 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 */
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 ++;
}
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 */
if( (p_item->i_type & CONFIG_ITEM) &&
!p_item->b_advanced ) 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 );
}
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 );
}
projects / vlc / blobdiff