# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include "libvlc.h"
/* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
#include "config/configuration.h"
#include "vlc_charset.h"
+#include "vlc_arrays.h"
#include "modules/modules.h"
#include "modules/builtin.h"
static module_t * AllocatePlugin( vlc_object_t *, char * );
#endif
static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) );
-static int DeleteModule ( module_t *, vlc_bool_t );
+static void DeleteModule ( module_t *, bool );
#ifdef HAVE_DYNAMIC_PLUGINS
static void DupModule ( module_t * );
static void UndupModule ( module_t * );
#endif
-static void module_LoadMain( vlc_object_t *p_this );
-
/**
* Init bank
*
void __module_InitBank( vlc_object_t *p_this )
{
module_bank_t *p_bank = NULL;
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
- if( p_libvlc_global->p_module_bank )
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
+
+ if( p_libvlc_global->p_module_bank == NULL )
{
- p_libvlc_global->p_module_bank->i_usage++;
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
- return;
+ p_bank = vlc_custom_create( p_this, sizeof(module_bank_t),
+ VLC_OBJECT_GENERIC, "module bank");
+ p_bank->i_usage = 1;
+ p_bank->i_cache = p_bank->i_loaded_cache = 0;
+ p_bank->pp_cache = p_bank->pp_loaded_cache = NULL;
+ p_bank->b_cache = p_bank->b_cache_dirty =
+ p_bank->b_cache_delete = false;
+
+ /* Everything worked, attach the object */
+ p_libvlc_global->p_module_bank = p_bank;
+ vlc_object_attach( p_bank, p_libvlc_global );
+
+ /* Fills the module bank structure with the main module infos.
+ * This is very useful as it will allow us to consider the main
+ * library just as another module, and for instance the configuration
+ * options of main will be available in the module bank structure just
+ * as for every other module. */
+ AllocateBuiltinModule( p_this, vlc_entry__main );
}
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ else
+ p_libvlc_global->p_module_bank->i_usage++;
- p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
- if( !p_bank )
- return;
- p_bank->psz_object_name = "module bank";
- p_bank->i_usage = 1;
- p_bank->i_cache = p_bank->i_loaded_cache = 0;
- p_bank->pp_cache = p_bank->pp_loaded_cache = NULL;
- p_bank->b_cache = p_bank->b_cache_dirty =
- p_bank->b_cache_delete = VLC_FALSE;
-
- /* Everything worked, attach the object */
- p_libvlc_global->p_module_bank = p_bank;
- vlc_object_attach( p_bank, p_libvlc_global );
-
- module_LoadMain( p_this );
+ vlc_mutex_unlock( lock );
}
void __module_EndBank( vlc_object_t *p_this )
{
module_t * p_next = NULL;
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( !p_libvlc_global->p_module_bank )
{
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ vlc_mutex_unlock( lock );
return;
}
if( --p_libvlc_global->p_module_bank->i_usage )
{
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ vlc_mutex_unlock( lock );
return;
}
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ vlc_mutex_unlock( lock );
/* Save the configuration */
config_AutoSaveConfigFile( p_this );
vlc_object_detach( p_libvlc_global->p_module_bank );
- while( p_libvlc_global->p_module_bank->i_children )
+ while( vlc_internals( p_libvlc_global->p_module_bank )->i_children )
{
- p_next = (module_t *)p_libvlc_global->p_module_bank->pp_children[0];
-
- if( DeleteModule( p_next, VLC_TRUE ) )
- {
- /* Module deletion failed */
- msg_Err( p_this, "module \"%s\" can't be removed, trying harder",
- p_next->psz_object_name );
-
- /* We just free the module by hand. Niahahahahaha. */
- vlc_object_detach( p_next );
- vlc_object_release( p_next );
- }
+ p_next = (module_t *)vlc_internals( p_libvlc_global->p_module_bank )->pp_children[0];
+ DeleteModule( p_next, true );
}
vlc_object_release( p_libvlc_global->p_module_bank );
p_libvlc_global->p_module_bank = NULL;
}
-/**
- * Load the main program info into the module bank.
- *
- * Fills the module bank structure with the main module infos.
- * This is very useful as it will allow us to consider the main program just
- * as another module, and for instance the configuration options of main will
- * be available in the module bank structure just as for every other module.
- * \param p_this vlc object structure
- * \return nothing
- */
-static void module_LoadMain( vlc_object_t *p_this )
-{
- vlc_value_t lockval;
- libvlc_global_data_t *p_libvlc_global = vlc_global();
-
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
- if( p_libvlc_global->p_module_bank->b_main )
- {
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
- return;
- }
- p_libvlc_global->p_module_bank->b_main = VLC_TRUE;
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
-
- AllocateBuiltinModule( p_this, vlc_entry__main );
-}
-
/**
* Load all modules which we built with.
*
*/
void __module_LoadBuiltins( vlc_object_t * p_this )
{
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( p_libvlc_global->p_module_bank->b_builtins )
{
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ vlc_mutex_unlock( lock );
return;
}
- p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE;
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ p_libvlc_global->p_module_bank->b_builtins = true;
+ vlc_mutex_unlock( lock );
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
void __module_LoadPlugins( vlc_object_t * p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( p_libvlc_global->p_module_bank->b_plugins )
{
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ vlc_mutex_unlock( lock );
return;
}
- p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE;
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc_global, "libvlc" );
+ p_libvlc_global->p_module_bank->b_plugins = true;
+ vlc_mutex_unlock( lock );
msg_Dbg( p_this, "checking plugin modules" );
if( config_GetInt( p_this, "plugins-cache" ) )
- p_libvlc_global->p_module_bank->b_cache = VLC_TRUE;
+ p_libvlc_global->p_module_bank->b_cache = true;
if( p_libvlc_global->p_module_bank->b_cache ||
p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this );
* \param cap the capability to check
* \return TRUE if the module have the capability
*/
-vlc_bool_t module_IsCapable( const module_t *m, const char *cap )
+bool module_IsCapable( const module_t *m, const char *cap )
{
return !strcmp( m->psz_capability, cap );
}
* \param long_name TRUE to have the long name of the module
* \return the short or long name of the module
*/
-const char *module_GetName( const module_t *m, vlc_bool_t long_name )
+const char *module_GetName( const module_t *m, bool long_name )
{
if( long_name && ( m->psz_longname != NULL) )
return m->psz_longname;
* \return the module or NULL in case of a failure
*/
module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
- const char *psz_name, vlc_bool_t b_strict )
+ const char *psz_name, bool b_strict )
{
typedef struct module_list_t module_list_t;
+ stats_TimerStart( p_this, "module_Need()", STATS_TIMER_MODULE_NEED );
+
struct module_list_t
{
module_t *p_module;
int i_score;
- vlc_bool_t b_force;
+ bool b_force;
module_list_t *p_next;
};
int i_shortcuts = 0;
char *psz_shortcuts = NULL, *psz_var = NULL, *psz_alias = NULL;
- vlc_bool_t b_force_backup = p_this->b_force;
+ bool b_force_backup = p_this->b_force;
/* Deal with variables */
if( psz_name && psz_name[0] == '$' )
{
- vlc_value_t val;
- var_Create( p_this, psz_name + 1, VLC_VAR_MODULE | VLC_VAR_DOINHERIT );
- var_Get( p_this, psz_name + 1, &val );
- psz_var = val.psz_string;
- psz_name = psz_var;
+ psz_name = psz_var = var_CreateGetString( p_this, psz_name + 1 );
}
/* Count how many different shortcuts were asked for */
if( !strcmp( psz_name, "none" ) )
{
free( psz_var );
+ stats_TimerStop( p_this, STATS_TIMER_MODULE_NEED );
+ stats_TimerDump( p_this, STATS_TIMER_MODULE_NEED );
+ stats_TimerClean( p_this, STATS_TIMER_MODULE_NEED );
return NULL;
}
{
if( !strcmp(psz_last_shortcut, "none") )
{
- b_strict = VLC_TRUE;
+ b_strict = true;
i_shortcuts--;
}
else if( !strcmp(psz_last_shortcut, "any") )
{
- b_strict = VLC_FALSE;
+ b_strict = false;
i_shortcuts--;
}
}
/* If we required a shortcut, check this plugin provides it. */
if( i_shortcuts > 0 )
{
- vlc_bool_t b_trash;
+ bool b_trash;
const char *psz_name = psz_shortcuts;
/* Let's drop modules with a <= 0 score (unless they are
{
CacheMerge( p_this, p_module, p_new_module );
vlc_object_attach( p_new_module, p_module );
- DeleteModule( p_new_module, VLC_TRUE );
+ DeleteModule( p_new_module, true );
}
}
#endif
/* This assumes that p_this is the object which will be using the
* module. That's not always the case ... but it is in most cases.
*/
- p_this->psz_object_name = p_module->psz_object_name;
+ if( psz_alias )
+ p_this->psz_object_name = strdup( psz_alias );
+ else
+ p_this->psz_object_name = strdup( p_module->psz_object_name );
}
free( psz_shortcuts );
free( psz_var );
+ stats_TimerStop( p_this, STATS_TIMER_MODULE_NEED );
+ stats_TimerDump( p_this, STATS_TIMER_MODULE_NEED );
+ stats_TimerClean( p_this, STATS_TIMER_MODULE_NEED );
+
/* Don't forget that the module is still locked */
return p_module;
}
msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name );
vlc_object_release( p_module );
-
- return;
}
/**
* \param psz_name th name of the module
* \return TRUE if the module exists
*/
-vlc_bool_t __module_Exists( vlc_object_t *p_this, const char * psz_name )
+bool __module_Exists( vlc_object_t *p_this, const char * psz_name )
{
module_t *p_module = __module_Find( p_this, psz_name );
if( p_module )
{
module_Put( p_module );
- return VLC_TRUE;
+ return true;
}
else
{
- return VLC_FALSE;
+ return false;
}
}
psz_ret[j] = strdup( k>=0?p_module->pp_shortcuts[k]
:p_module->psz_object_name );
if( pppsz_longname )
- (*pppsz_longname)[j] = strdup( module_GetName( p_module, VLC_TRUE ) );
+ (*pppsz_longname)[j] = strdup( module_GetName( p_module, true ) );
j++;
}
}
* Following functions are local.
*****************************************************************************/
+ /*****************************************************************************
+ * copy_next_paths_token: from a PATH_SEP_CHAR (a ':' or a ';') separated paths
+ * return first path.
+ *****************************************************************************/
+static char * copy_next_paths_token( char * paths, char ** remaining_paths )
+{
+ char * path;
+ int i, done;
+ bool escaped = false;
+
+ assert( paths );
+
+ /* Alloc a buffer to store the path */
+ path = malloc( strlen( paths ) + 1 );
+ if( !path ) return NULL;
+
+ /* Look for PATH_SEP_CHAR (a ':' or a ';') */
+ for( i = 0, done = 0 ; paths[i]; i++ )
+ {
+ /* Take care of \\ and \: or \; escapement */
+ if( escaped )
+ {
+ escaped = false;
+ path[done++] = paths[i];
+ }
+#ifdef WIN32
+ else if( paths[i] == '/' )
+ escaped = true;
+#else
+ else if( paths[i] == '\\' )
+ escaped = true;
+#endif
+ else if( paths[i] == PATH_SEP_CHAR )
+ break;
+ else
+ path[done++] = paths[i];
+ }
+ path[done++] = 0;
+
+ /* Return the remaining paths */
+ if( remaining_paths ) {
+ *remaining_paths = paths[i] ? &paths[i]+1 : NULL;
+ }
+
+ return path;
+}
+
/*****************************************************************************
* AllocateAllPlugins: load all plugin modules we can find.
*****************************************************************************/
#ifdef HAVE_DYNAMIC_PLUGINS
static void AllocateAllPlugins( vlc_object_t *p_this )
{
- char *path, *ppsz_path, *psz_iter;
-
-#if defined( WIN32 ) || defined( UNDER_CE )
- const char * extra_path = "";
-#else
- const char * extra_path = PLUGIN_PATH;
+ const char *vlcpath = vlc_global()->psz_vlcpath;
+ int count,i;
+ char * path;
+ vlc_array_t *arraypaths = vlc_array_new();
+
+ /* Contruct the special search path for system that have a relocatable
+ * executable. Set it to <vlc path>/modules and <vlc path>/plugins. */
+
+ if( vlcpath && asprintf( &path, "%s" DIR_SEP "modules", vlcpath ) != -1 )
+ vlc_array_append( arraypaths, path );
+ if( vlcpath && asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 )
+ vlc_array_append( arraypaths, path );
+#ifndef WIN32
+ vlc_array_append( arraypaths, strdup( PLUGIN_PATH ) );
#endif
/* If the user provided a plugin path, we add it to the list */
- char * userpath = config_GetPsz( p_this, "plugin-path" );
- bool end = false;
+ char *userpaths = config_GetPsz( p_this, "plugin-path" );
+ char *paths_iter;
- if( asprintf( &path, "modules%s:plugins:%s", extra_path, userpath ) < 0 )
+ for( paths_iter = userpaths; paths_iter; )
{
- msg_Err( p_this, "Not enough memory" );
- free( userpath );
- return;
+ path = copy_next_paths_token( paths_iter, &paths_iter );
+ if( path )
+ vlc_array_append( arraypaths, path );
}
- /* Free plugin-path */
- free( userpath );
-
- for( ppsz_path = path; !end; )
+ count = vlc_array_count( arraypaths );
+ for( i = 0 ; i < count ; i++ )
{
- char *psz_fullpath;
-
- /* Look for PATH_SEP_CHAR (a ':' or a ';') */
- for( psz_iter = ppsz_path; *psz_iter && *psz_iter != PATH_SEP_CHAR; psz_iter++ );
- if( !*psz_iter ) end = true;
- else *psz_iter = 0;
-
-#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 )
-
- /* Handle relative as well as absolute paths */
-#ifdef WIN32
- if( ppsz_path[0] != '\\' && ppsz_path[0] != '/' && ppsz_path[0] != ':' )
-#else
- if( ppsz_path[0] != '/' )
-#endif
- {
- if( 0>= asprintf( &psz_fullpath, "%s"DIR_SEP"%s",
- vlc_global()->psz_vlcpath, ppsz_path) )
- psz_fullpath = NULL;
- }
- else
-#endif
- psz_fullpath = strdup( ppsz_path );
-
- if( psz_fullpath == NULL )
+ path = vlc_array_item_at_index( arraypaths, i );
+ if( !path )
continue;
- msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath );
+ msg_Dbg( p_this, "recursively browsing `%s'", path );
/* Don't go deeper than 5 subdirectories */
- AllocatePluginDir( p_this, psz_fullpath, 5 );
+ AllocatePluginDir( p_this, path, 5 );
- free( psz_fullpath );
- if( !end ) ppsz_path = psz_iter + 1;
+ free( path );
}
- /* Free plugin-path */
- free( path );
+ vlc_array_destroy( arraypaths );
+ free( userpaths );
}
/*****************************************************************************
module_config_t *p_item = NULL, *p_end = NULL;
p_module = p_cache_entry->p_module;
- p_module->b_loaded = VLC_FALSE;
+ p_module->b_loaded = false;
/* For now we force loading if the module's config contains
* callbacks or actions.
}
}
if( p_module == p_cache_entry->p_module )
- p_cache_entry->b_used = VLC_TRUE;
+ p_cache_entry->b_used = true;
}
}
/* Everything worked fine !
* The module is ready to be added to the list. */
- p_module->b_builtin = VLC_FALSE;
+ p_module->b_builtin = false;
/* msg_Dbg( p_this, "plugin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time;
p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size;
p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1;
- p_bank->pp_cache[p_bank->i_cache]->b_used = VLC_TRUE;
+ p_bank->pp_cache[p_bank->i_cache]->b_used = true;
p_bank->pp_cache[p_bank->i_cache]->p_module = p_module;
p_bank->i_cache++;
+#undef p_bank
}
return p_module ? 0 : -1;
p_module = vlc_module_create( p_this );
if( p_module == NULL )
{
- msg_Err( p_this, "out of memory" );
module_Unload( handle );
return NULL;
}
/* We need to fill these since they may be needed by module_Call() */
p_module->psz_filename = psz_file;
p_module->handle = handle;
- p_module->b_loaded = VLC_TRUE;
+ p_module->b_loaded = true;
/* Initialize the module: fill p_module, default config */
if( module_Call( p_module ) != 0 )
p_module->psz_filename = strdup( p_module->psz_filename );
/* Everything worked fine ! The module is ready to be added to the list. */
- p_module->b_builtin = VLC_FALSE;
+ p_module->b_builtin = false;
return p_module;
}
*****************************************************************************/
static void DupModule( module_t *p_module )
{
- const char **pp_shortcut;
+ char **pp_shortcut;
int i_submodule;
for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ )
/* We strdup() these entries so that they are still valid when the
* module is unloaded. */
- p_module->psz_object_name = strdup( p_module->psz_object_name );
p_module->psz_capability = strdup( p_module->psz_capability );
p_module->psz_shortname = p_module->psz_shortname ?
strdup( p_module->psz_shortname ) : NULL;
p_module->psz_help = p_module->psz_help ? strdup( p_module->psz_help )
: NULL;
- for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
+ for( i_submodule = 0; i_submodule < vlc_internals( p_module )->i_children; i_submodule++ )
{
- DupModule( (module_t*)p_module->pp_children[ i_submodule ] );
+ DupModule( (module_t*)vlc_internals( p_module )->pp_children[ i_submodule ] );
}
}
*****************************************************************************/
static void UndupModule( module_t *p_module )
{
- const char **pp_shortcut;
+ char **pp_shortcut;
int i_submodule;
- for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
+ for( i_submodule = 0; i_submodule < vlc_internals( p_module )->i_children; i_submodule++ )
{
- UndupModule( (module_t*)p_module->pp_children[ i_submodule ] );
+ UndupModule( (module_t*)vlc_internals( p_module )->pp_children[ i_submodule ] );
}
for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ )
{
- free( (void*)*pp_shortcut );
+ free( *pp_shortcut );
}
- free( (void*)p_module->psz_object_name );
+ FREENULL( p_module->psz_object_name );
free( p_module->psz_capability );
- free( (void*)p_module->psz_shortname );
- free( (void*)p_module->psz_longname );
- free( (void*)p_module->psz_help );
+ free( p_module->psz_shortname );
+ free( p_module->psz_longname );
+ free( p_module->psz_help );
}
#endif /* HAVE_DYNAMIC_PLUGINS */
* allocate a structure for it */
p_module = vlc_module_create( p_this );
if( p_module == NULL )
- {
- msg_Err( p_this, "out of memory" );
return -1;
- }
/* Initialize the module : fill p_module->psz_object_name, etc. */
if( pf_entry( p_module ) != 0 )
}
/* Everything worked fine ! The module is ready to be added to the list. */
- p_module->b_builtin = VLC_TRUE;
+ p_module->b_builtin = true;
/* msg_Dbg( p_this, "builtin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
*****************************************************************************
* This function can only be called if the module isn't being used.
*****************************************************************************/
-static int DeleteModule( module_t * p_module, vlc_bool_t b_detach )
+static void DeleteModule( module_t * p_module, bool b_detach )
{
- if( !p_module ) return VLC_EGENERIC;
+ assert( p_module );
+
if( b_detach )
vlc_object_detach( p_module );
#endif
/* Free and detach the object's children */
- while( p_module->i_children )
+ while( vlc_internals( p_module )->i_children )
{
- vlc_object_t *p_this = p_module->pp_children[0];
+ vlc_object_t *p_this = vlc_internals( p_module )->pp_children[0];
vlc_object_detach( p_this );
vlc_object_release( p_this );
}
config_Free( p_module );
vlc_object_release( p_module );
- p_module = NULL;
- return 0;
}
projects / vlc / blobdiff