X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=7ed2697b26c2c078529642fd782fbdb3d2098472;hb=58275b9dd582d873d42c08a47873ae44b67f1003;hp=b7828888ff96ec28b350a4af315690a54011c649;hpb=70a56d5650791c01455027322181efcb045b529d;p=vlc diff --git a/src/modules/entry.c b/src/modules/entry.c index b7828888ff..7ed2697b26 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -25,23 +25,18 @@ #include #include -#undef vlc_module_set -#undef vlc_config_set +#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->psz_object_name); free (module); } @@ -60,7 +55,6 @@ 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; @@ -69,9 +63,7 @@ module_t *vlc_module_create (vlc_object_t *obj) module->pp_shortcuts[i] = NULL; 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; @@ -81,6 +73,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; @@ -112,40 +105,82 @@ 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[0] = module->pp_shortcuts[0]; /* object name */ + for (unsigned i = 1; i < MODULE_SHORTCUT_MAX; i++) + submodule->pp_shortcuts[i] = NULL; 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; } +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_or_free (tab, (confsize + 17) * sizeof (*tab)); + if (tab == NULL) + return NULL; + + module->p_config = tab; + } + + memset (tab + confsize, 0, sizeof (tab[confsize])); + tab[confsize].i_type = type; + + if (type & CONFIG_ITEM) + { + module->i_config_items++; + if (type == CONFIG_ITEM_BOOL) + module->i_bool_items++; + } + + module->confsize++; + return tab + confsize; +} + -static int vlc_module_set (module_t *module, int propid, va_list ap) +int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) { - int ret = VLC_SUCCESS; + va_list ap; + int ret = 0; + 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_CONFIG_CREATE: + { + 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; + } case VLC_MODULE_SHORTCUT: { unsigned i; for (i = 0; module->pp_shortcuts[i] != NULL; i++); - if (i >= (MODULE_SHORTCUT_MAX - 1)) - { - ret = VLC_ENOMEM; - break; - } + if (i >= (MODULE_SHORTCUT_MAX - 1)) + break; module->pp_shortcuts[i] = va_arg (ap, char *); break; @@ -183,78 +218,21 @@ static int vlc_module_set (module_t *module, int propid, va_list ap) } 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; - } - default: - fprintf (stderr, "LibVLC: unknown module property %d", propid); - fprintf (stderr, "LibVLC: too old to use this module?"); - ret = VLC_EGENERIC; + case VLC_MODULE_TEXTDOMAIN: + module->domain = va_arg (ap, char *); break; - } - return ret; -} - -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)); - if (tab == NULL) - return NULL; - - module->p_config = tab; - } - - memset (tab + confsize, 0, sizeof (tab[confsize])); - tab[confsize].i_type = type; - tab[confsize].p_lock = &module->lock; - - if (type & CONFIG_ITEM) - { - module->i_config_items++; - if (type == CONFIG_ITEM_BOOL) - module->i_bool_items++; - } - - module->confsize++; - return tab + confsize; -} - -static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) -{ - int ret = -1; - assert (item != NULL); - - switch (id) - { case VLC_CONFIG_NAME: { const char *name = va_arg (ap, const char *); @@ -263,7 +241,6 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) assert (name != NULL); item->psz_name = strdup (name); item->pf_callback = cb; - ret = 0; break; } @@ -273,14 +250,12 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) { item->orig.i = item->saved.i = item->value.i = va_arg (ap, int); - ret = 0; } else if (IsConfigFloatType (item->i_type)) { item->orig.f = item->saved.f = item->value.f = va_arg (ap, double); - ret = 0; } else if (IsConfigStringType (item->i_type)) @@ -289,7 +264,6 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) item->value.psz = value ? strdup (value) : NULL; item->orig.psz = value ? strdup (value) : NULL; item->saved.psz = value ? strdup (value) : NULL; - ret = 0; } break; } @@ -302,92 +276,74 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) { item->min.i = va_arg (ap, int); item->max.i = va_arg (ap, int); - ret = 0; } else if (IsConfigFloatType (item->i_type)) { item->min.f = va_arg (ap, double); item->max.f = va_arg (ap, double); - ret = 0; } break; } case VLC_CONFIG_ADVANCED: item->b_advanced = true; - ret = 0; break; case VLC_CONFIG_VOLATILE: item->b_unsaveable = true; - ret = 0; break; case VLC_CONFIG_PERSISTENT: item->b_autosave = true; - ret = 0; break; case VLC_CONFIG_RESTART: item->b_restart = true; - ret = 0; break; case VLC_CONFIG_PRIVATE: item->b_internal = true; - ret = 0; break; case VLC_CONFIG_REMOVED: item->b_removed = true; - ret = 0; break; case VLC_CONFIG_CAPABILITY: { const char *cap = va_arg (ap, const char *); item->psz_type = cap ? strdup (cap) : NULL; - ret = 0; break; } case VLC_CONFIG_SHORTCUT: item->i_short = va_arg (ap, int); - ret = 0; break; case VLC_CONFIG_OLDNAME: { const char *oldname = va_arg (ap, const char *); item->psz_oldname = oldname ? strdup (oldname) : NULL; - ret = 0; break; } case VLC_CONFIG_SAFE: item->b_safe = true; - ret = 0; break; 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; - ret = 0; + 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 */ @@ -404,21 +360,6 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) 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 *); @@ -436,9 +377,6 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) break; /* Copy textual descriptions */ - if (domain == NULL) - domain = PACKAGE; - const char *const *text = va_arg (ap, const char *const *); if (text != NULL) { @@ -446,9 +384,7 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) 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; @@ -458,13 +394,11 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) item->i_list = len; item->pf_update_list = va_arg (ap, vlc_callback_t); - ret = 0; break; } 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; @@ -483,33 +417,23 @@ static int vlc_config_set (module_config_t *restrict item, int id, va_list ap) 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; item->i_action++; - ret = 0; break; } - } - return ret; -} -int vlc_plugin_set (module_t *module, module_config_t *cfg, int id, ...) -{ - va_list ap; - int ret = -1; + default: + fprintf (stderr, "LibVLC: unknown module property %d\n", propid); + fprintf (stderr, "LibVLC: too old to use this module?\n"); + ret = -1; + break; + } - va_start (ap, id); - if (module != NULL) - ret = vlc_module_set (module, id, ap); - else if (cfg != NULL) - ret = vlc_config_set (cfg, id, ap); va_end (ap); - return ret; }