#include <vlc_common.h>
#include <vlc_plugin.h>
+#include <vlc_memory.h>
#include "libvlc.h"
#include <stdlib.h> /* free(), strtol() */
# include <dirent.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#include "vlc_charset.h"
#include "vlc_arrays.h"
-#include <vlc_cpu.h>
#include "modules/modules.h"
assert (p_bank != NULL);
/* Save the configuration */
- if( !config_GetInt( p_this, "ignore-config" ) )
+ if( !var_InheritBool( p_this, "ignore-config" ) )
config_AutoSaveConfigFile( p_this );
/* If plugins were _not_ loaded, then the caller still has the bank lock
p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->p_module );
free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file );
free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] );
- p_bank->pp_loaded_cache[p_bank->i_loaded_cache] = NULL;
}
}
- if( p_bank->pp_loaded_cache )
- {
- free( p_bank->pp_loaded_cache );
- p_bank->pp_loaded_cache = NULL;
- }
+ free( p_bank->pp_loaded_cache );
while( p_bank->i_cache-- )
{
free( p_bank->pp_cache[p_bank->i_cache]->psz_file );
free( p_bank->pp_cache[p_bank->i_cache] );
- p_bank->pp_cache[p_bank->i_cache] = NULL;
- }
- if( p_bank->pp_cache )
- {
- free( p_bank->pp_cache );
- p_bank->pp_cache = NULL;
}
+ free( p_bank->pp_cache );
#endif
while( p_bank->head != NULL )
if( p_bank->i_usage == 1 )
{
msg_Dbg( p_this, "checking plugin modules" );
- p_module_bank->b_cache = config_GetInt( p_this, "plugins-cache" ) > 0;
+ p_module_bank->b_cache = var_InheritBool( p_this, "plugins-cache" );
if( p_module_bank->b_cache || b_cache_delete )
CacheLoad( p_this, p_module_bank, b_cache_delete );
* \param p_this the vlc object
* \param psz_capability list of capabilities needed
* \param psz_name name of the module asked
- * \param b_strict TRUE yto use the strict mode
+ * \param b_strict if true, do not fallback to plugin with a different name
+ * but the same capability
* \return the module or NULL in case of a failure
*/
module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
}
i_shortcuts++;
- psz_shortcuts = psz_last_shortcut = strdup( psz_name );
+ psz_parser = psz_shortcuts = psz_last_shortcut = strdup( psz_name );
- for( psz_parser = psz_shortcuts; *psz_parser; psz_parser++ )
+ while( ( psz_parser = strchr( psz_parser, ',' ) ) )
{
- if( *psz_parser == ',' )
- {
- *psz_parser = '\0';
- i_shortcuts++;
- psz_last_shortcut = psz_parser + 1;
- }
+ *psz_parser = '\0';
+ i_shortcuts++;
+ psz_last_shortcut = ++psz_parser;
}
/* Check if the user wants to override the "strict" mode */
size_t count;
module_t **p_all = module_list_get (&count);
p_list = malloc( count * sizeof( module_list_t ) );
- unsigned i_cpu = vlc_CPU();
/* Parse the module list for capabilities and probe each of them */
count = 0;
for (size_t i = 0; (p_module = p_all[i]) != NULL; i++)
{
- bool b_shortcut_bonus = false;
+ int i_shortcut_bonus = 0;
/* Test that this module can do what we need */
if( !module_provides( p_module, psz_capability ) )
continue;
- /* Test if we have the required CPU */
- if( (p_module->i_cpu & i_cpu) != p_module->i_cpu )
- continue;
/* If we required a shortcut, check this plugin provides it. */
if( i_shortcuts > 0 )
/* Found it */
if( c && c[1] )
psz_alias = c+1;
- b_shortcut_bonus = true;
+ i_shortcut_bonus = i_short * 10000;
goto found_shortcut;
}
}
found_shortcut:
/* Store this new module */
p_list[count].p_module = module_hold (p_module);
- p_list[count].i_score = p_module->i_score;
- if( b_shortcut_bonus )
- p_list[count].i_score += 10000;
- p_list[count].b_force = b_shortcut_bonus && b_strict;
+ p_list[count].i_score = p_module->i_score + i_shortcut_bonus;
+ p_list[count].b_force = i_shortcut_bonus && b_strict;
count++;
}
return module;
}
-/**
- * GetModuleNamesForCapability
- *
- * Return a NULL terminated array with the names of the modules
- * that have a certain capability.
- * Free after uses both the string and the table.
- * \param psz_capability the capability asked
- * \param pppsz_longname an pointer to an array of string to contain
- the long names of the modules. If set to NULL the function don't use it.
- * \return the NULL terminated array
- */
-char ** module_GetModulesNamesForCapability( const char *psz_capability,
- char ***pppsz_longname )
-{
- size_t count = 0;
- char **psz_ret;
-
- module_t **list = module_list_get (NULL);
-
- /* Proceed in two passes: count the number of modules first */
- for (size_t i = 0; list[i]; i++)
- {
- module_t *p_module = list[i];
- const char *psz_module_capability = p_module->psz_capability;
-
- if( psz_module_capability
- && !strcmp( psz_module_capability, psz_capability ) )
- count++;
- }
-
- /* Then get the names */
- psz_ret = malloc( sizeof(char*) * (count+1) );
- if( pppsz_longname )
- *pppsz_longname = malloc( sizeof(char*) * (count+1) );
- if( !psz_ret || ( pppsz_longname && *pppsz_longname == NULL ) )
- {
- free( psz_ret );
- if( pppsz_longname )
- {
- free( *pppsz_longname );
- *pppsz_longname = NULL;
- }
- module_list_free (list);
- return NULL;
- }
-
- for (size_t i = 0, j = 0; list[i]; i++)
- {
- module_t *p_module = list[i];
- const char *psz_module_capability = p_module->psz_capability;
-
- if( psz_module_capability
- && !strcmp( psz_module_capability, psz_capability ) )
- {
- /* Explicit hack: Use the last shortcut. It _should_ be
- * different from the object name, at least if the object
- * contains multiple submodules with the same capability. */
- unsigned k = 0;
- while( p_module->pp_shortcuts[k] != NULL )
- k++;
- assert( k > 0); /* pp_shortcuts[0] is always set */
- psz_ret[j] = strdup( p_module->pp_shortcuts[k - 1] );
- if( pppsz_longname )
- (*pppsz_longname)[j] = strdup( module_get_name( p_module, true ) );
- j++;
- }
- }
- psz_ret[count] = NULL;
-
- module_list_free (list);
-
- return psz_ret;
-}
-
/**
* Get the configuration of a module
*
#endif
/* If the user provided a plugin path, we add it to the list */
- char *userpaths = config_GetPsz( p_this, "plugin-path" );
+ char *userpaths = var_InheritString( p_this, "plugin-path" );
char *paths_iter;
for( paths_iter = userpaths; paths_iter; )
break;
/* Skip ".", ".." */
- if (!strcmp (file, ".") || !strcmp (file, ".."))
+ if (!strcmp (file, ".") || !strcmp (file, "..")
+ /* Skip directories for unsupported optimizations */
+ || !vlc_CPU_CheckPluginDir (file))
{
free (file);
continue;
/* Add entry to cache */
module_cache_t **pp_cache = p_bank->pp_cache;
- pp_cache = realloc( pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
+ pp_cache = realloc_or_free( pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
if( pp_cache == NULL )
return -1;
pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) );
projects / vlc / blobdiff