X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=cf99b081adb8d244619536b1380f8c1cd6d58349;hb=37a4eca2752150fbcdd0b760a55a6b29557f1ec8;hp=a3679f17f727e701607a5c54acc06de30199d847;hpb=4e4720311a10bf0917cc826369438c6565d56a4f;p=vlc diff --git a/src/modules/entry.c b/src/modules/entry.c index a3679f17f7..cf99b081ad 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "modules/modules.h" #include "config/configuration.h" @@ -37,7 +38,7 @@ static void vlc_module_destruct (gc_object_t *obj) { module_t *module = vlc_priv (obj, module_t); - vlc_mutex_destroy (&module->lock); + free (module->pp_shortcuts); free (module->psz_object_name); free (module); } @@ -56,18 +57,15 @@ module_t *vlc_module_create (vlc_object_t *obj) module->parent = NULL; module->submodule_count = 0; vlc_gc_init (module, vlc_module_destruct); - vlc_mutex_init (&module->lock); module->psz_shortname = NULL; module->psz_longname = (char*)default_name; module->psz_help = NULL; - for (unsigned i = 0; i < MODULE_SHORTCUT_MAX; i++) - module->pp_shortcuts[i] = NULL; + module->pp_shortcuts = NULL; + module->i_shortcuts = 0; module->psz_capability = (char*)""; module->i_score = 1; - module->i_cpu = 0; module->b_unloadable = true; - module->b_reentrant = true; module->b_submodule = false; module->pf_activate = NULL; module->pf_deactivate = NULL; @@ -77,6 +75,7 @@ module_t *vlc_module_create (vlc_object_t *obj) module->i_bool_items = 0; /*module->handle = garbage */ module->psz_filename = NULL; + module->domain = NULL; module->b_builtin = false; module->b_loaded = false; @@ -88,6 +87,7 @@ module_t *vlc_module_create (vlc_object_t *obj) static void vlc_submodule_destruct (gc_object_t *obj) { module_t *module = vlc_priv (obj, module_t); + free (module->pp_shortcuts); free (module->psz_object_name); free (module); } @@ -108,17 +108,17 @@ module_t *vlc_submodule_create (module_t *module) module->submodule_count++; /* Muahahaha! Heritage! Polymorphism! Ugliness!! */ + submodule->pp_shortcuts = malloc( sizeof( char ** ) ); submodule->pp_shortcuts[0] = module->pp_shortcuts[0]; /* object name */ - for (unsigned i = 1; i < MODULE_SHORTCUT_MAX; i++) - submodule->pp_shortcuts[i] = NULL; + submodule->i_shortcuts = 1; submodule->psz_object_name = strdup( module->psz_object_name ); submodule->psz_shortname = module->psz_shortname; submodule->psz_longname = module->psz_longname; submodule->psz_capability = module->psz_capability; submodule->i_score = module->i_score; - submodule->i_cpu = module->i_cpu; submodule->b_submodule = true; + submodule->domain = module->domain; return submodule; } @@ -137,8 +137,12 @@ static module_config_t *vlc_config_create (module_t *module, int type) } memset (tab + confsize, 0, sizeof (tab[confsize])); + if (IsConfigIntegerType (type)) + { + tab[confsize].max.i = INT_MAX; + tab[confsize].min.i = INT_MIN; + } tab[confsize].i_type = type; - tab[confsize].p_lock = &module->lock; if (type & CONFIG_ITEM) { @@ -156,6 +160,8 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) { va_list ap; int ret = 0; + typedef int(*int_fp_vlcobjectt)(vlc_object_t *) ; + typedef void(*void_fp_vlcobjectt)(vlc_object_t *); va_start (ap, propid); switch (propid) @@ -179,19 +185,24 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) break; } - case VLC_MODULE_CPU_REQUIREMENT: - assert (!module->b_submodule); - module->i_cpu |= va_arg (ap, int); - break; - case VLC_MODULE_SHORTCUT: { - unsigned i; - for (i = 0; module->pp_shortcuts[i] != NULL; i++); - if (i >= (MODULE_SHORTCUT_MAX - 1)) - break; - - module->pp_shortcuts[i] = va_arg (ap, char *); + unsigned i_shortcuts = va_arg (ap, unsigned); + unsigned index = module->i_shortcuts; + /* The cache loader accept only a small number of shortcuts */ + assert(i_shortcuts + index <= MODULE_SHORTCUT_MAX); + + const char *const *tab = va_arg (ap, const char *const *); + const char **pp = realloc (module->pp_shortcuts, + sizeof (pp[0]) * (index + i_shortcuts)); + if (unlikely(pp == NULL)) + { + ret = -1; + break; + } + module->pp_shortcuts = pp; + module->i_shortcuts = index + i_shortcuts; + memcpy (pp + index, tab, sizeof (pp[0]) * i_shortcuts); break; } @@ -204,11 +215,11 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) break; case VLC_MODULE_CB_OPEN: - module->pf_activate = va_arg (ap, int (*) (vlc_object_t *)); + module->pf_activate = va_arg (ap, int_fp_vlcobjectt); break; case VLC_MODULE_CB_CLOSE: - module->pf_deactivate = va_arg (ap, void (*) (vlc_object_t *)); + module->pf_deactivate = va_arg (ap, void_fp_vlcobjectt); break; case VLC_MODULE_NO_UNLOAD: @@ -220,7 +231,10 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) const char *value = va_arg (ap, const char *); free( module->psz_object_name ); module->psz_object_name = strdup( value ); + module->pp_shortcuts = malloc( sizeof( char ** ) ); module->pp_shortcuts[0] = (char*)value; /* dooh! */ + module->i_shortcuts = 1; + if (module->psz_longname == default_name) module->psz_longname = (char*)value; /* dooh! */ break; @@ -239,8 +253,7 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) break; case VLC_MODULE_TEXTDOMAIN: - (void) va_arg (ap, const char *); - /* FIXME: not implemented */ + module->domain = va_arg (ap, char *); break; case VLC_CONFIG_NAME: @@ -259,7 +272,7 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) if (IsConfigIntegerType (item->i_type)) { item->orig.i = item->saved.i = - item->value.i = va_arg (ap, int); + item->value.i = va_arg (ap, int64_t); } else if (IsConfigFloatType (item->i_type)) @@ -284,8 +297,8 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) || item->i_type == CONFIG_ITEM_MODULE_LIST_CAT || item->i_type == CONFIG_ITEM_MODULE_CAT) { - item->min.i = va_arg (ap, int); - item->max.i = va_arg (ap, int); + item->min.i = va_arg (ap, int64_t); + item->max.i = va_arg (ap, int64_t); } else if (IsConfigFloatType (item->i_type))