X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=cf99b081adb8d244619536b1380f8c1cd6d58349;hb=d56e311e7c89f128a4b9e69872231e97b2ac36e2;hp=cd03b08fbee4268bd34a24cb46b3669a5672ec14;hpb=51836e3ded398ca1281002391f19ff3bcabdd9eb;p=vlc diff --git a/src/modules/entry.c b/src/modules/entry.c index cd03b08fbe..cf99b081ad 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -25,21 +25,20 @@ #include #include +#include #include #include +#include #include "modules/modules.h" #include "config/configuration.h" #include "libvlc.h" -#ifndef ENABLE_NLS -# define dgettext(d, m) ((char *)(m)) -#endif 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); } @@ -58,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; @@ -79,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; @@ -90,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); } @@ -110,27 +108,28 @@ module_t *vlc_submodule_create (module_t *module) module->submodule_count++; /* Muahahaha! Heritage! Polymorphism! Ugliness!! */ - memcpy (submodule->pp_shortcuts, module->pp_shortcuts, - sizeof (submodule->pp_shortcuts)); + submodule->pp_shortcuts = malloc( sizeof( char ** ) ); + submodule->pp_shortcuts[0] = module->pp_shortcuts[0]; /* object name */ + 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; } -module_config_t *vlc_config_create (module_t *module, int type) +static module_config_t *vlc_config_create (module_t *module, int type) { unsigned confsize = module->confsize; module_config_t *tab = module->p_config; if ((confsize & 0xf) == 0) { - tab = realloc (tab, (confsize + 17) * sizeof (*tab)); + tab = realloc_or_free (tab, (confsize + 17) * sizeof (*tab)); if (tab == NULL) return NULL; @@ -138,8 +137,12 @@ 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) { @@ -157,23 +160,49 @@ 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) { - case VLC_MODULE_CPU_REQUIREMENT: - assert (!module->b_submodule); - module->i_cpu |= va_arg (ap, int); + case VLC_SUBMODULE_CREATE: + { + module_t **pp = va_arg (ap, module_t **); + *pp = vlc_submodule_create (module); + if (*pp == NULL) + ret = -1; break; + } - case VLC_MODULE_SHORTCUT: + case VLC_CONFIG_CREATE: { - unsigned i; - for (i = 0; module->pp_shortcuts[i] != NULL; i++); - if (i >= (MODULE_SHORTCUT_MAX - 1)) - break; + int type = va_arg (ap, int); + module_config_t **pp = va_arg (ap, module_config_t **); + *pp = vlc_config_create (module, type); + if (*pp == NULL) + ret = -1; + break; + } - module->pp_shortcuts[i] = va_arg (ap, char *); + case VLC_MODULE_SHORTCUT: + { + 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; } @@ -186,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: @@ -202,38 +231,30 @@ 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; } case VLC_MODULE_SHORTNAME: - { - const char *domain = va_arg (ap, const char *); - if (domain == NULL) - domain = PACKAGE; - module->psz_shortname = dgettext (domain, va_arg (ap, char *)); + module->psz_shortname = va_arg (ap, char *); break; - } case VLC_MODULE_DESCRIPTION: - { - const char *domain = va_arg (ap, const char *); - if (domain == NULL) - domain = PACKAGE; - module->psz_longname = dgettext (domain, va_arg (ap, char *)); + module->psz_longname = va_arg (ap, char *); break; - } case VLC_MODULE_HELP: - { - const char *domain = va_arg (ap, const char *); - if (domain == NULL) - domain = PACKAGE; - module->psz_help = dgettext (domain, va_arg (ap, char *)); + module->psz_help = va_arg (ap, char *); + break; + + case VLC_MODULE_TEXTDOMAIN: + module->domain = va_arg (ap, char *); break; - } case VLC_CONFIG_NAME: { @@ -251,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)) @@ -276,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)) @@ -336,21 +357,16 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) case VLC_CONFIG_DESC: { - const char *domain = va_arg (ap, const char *); const char *text = va_arg (ap, const char *); const char *longtext = va_arg (ap, const char *); - if (domain == NULL) - domain = PACKAGE; - item->psz_text = text ? strdup (dgettext (domain, text)) : NULL; - item->psz_longtext = - longtext ? strdup (dgettext (domain, longtext)) : NULL; + item->psz_text = text ? strdup (text) : NULL; + item->psz_longtext = longtext ? strdup (longtext) : NULL; break; } case VLC_CONFIG_LIST: { - const char *domain = va_arg (ap, const char *); size_t len = va_arg (ap, size_t); /* Copy values */ @@ -367,21 +383,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) item->pi_list = dst; } else -#if 0 - if (IsConfigFloatType (item->i_type)) - { - const float *src = va_arg (ap, const float *); - float *dst = malloc (sizeof (float) * (len + 1)); - - if (dst != NULL) - { - memcpy (dst, src, sizeof (float) * len); - dst[len] = 0.; - } - item->pf_list = dst; - } - else -#endif if (IsConfigStringType (item->i_type)) { const char *const *src = va_arg (ap, const char *const *); @@ -399,9 +400,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) break; /* Copy textual descriptions */ - if (domain == NULL) - domain = PACKAGE; - const char *const *text = va_arg (ap, const char *const *); if (text != NULL) { @@ -409,9 +407,7 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) if( dtext != NULL ) { for (size_t i = 0; i < len; i++) - dtext[i] = text[i] ? - strdup( dgettext( domain, text[i] ) ) : - NULL; + dtext[i] = text[i] ? strdup (text[i]) : NULL; dtext[len] = NULL; } item->ppsz_list_text = dtext; @@ -426,7 +422,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) case VLC_CONFIG_ADD_ACTION: { - const char *domain = va_arg (ap, const char *); vlc_callback_t cb = va_arg (ap, vlc_callback_t), *tabcb; const char *name = va_arg (ap, const char *); char **tabtext; @@ -445,10 +440,8 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) break; item->ppsz_action_text = tabtext; - if (domain == NULL) - domain = PACKAGE; if (name) - tabtext[item->i_action] = strdup (dgettext (domain, name)); + tabtext[item->i_action] = strdup (name); else tabtext[item->i_action] = NULL; tabtext[item->i_action + 1] = NULL;