X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=de6312f07bcb44d5c1d94ac5128ec0e97849b853;hb=540d82b411c8e2a03c54c06c2f6dc37e9188a0c1;hp=6af3fbac767295aa161239664b56ff32cf66c00d;hpb=5f62f401a2be8a45f119925dbbd241c48bab5da9;p=vlc diff --git a/src/modules/entry.c b/src/modules/entry.c index 6af3fbac76..de6312f07b 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -25,21 +25,18 @@ #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->psz_object_name); free (module); } @@ -58,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; @@ -67,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; @@ -110,15 +104,15 @@ 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; return submodule; } @@ -130,7 +124,7 @@ static module_config_t *vlc_config_create (module_t *module, int type) 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; @@ -139,7 +133,6 @@ static module_config_t *vlc_config_create (module_t *module, int type) memset (tab + confsize, 0, sizeof (tab[confsize])); tab[confsize].i_type = type; - tab[confsize].p_lock = &module->lock; if (type & CONFIG_ITEM) { @@ -180,11 +173,6 @@ 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; @@ -228,31 +216,21 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) } 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: + (void) va_arg (ap, const char *); + /* FIXME: not implemented */ break; - } case VLC_CONFIG_NAME: { @@ -355,21 +333,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 */ @@ -403,9 +376,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) { @@ -413,9 +383,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; @@ -430,7 +398,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; @@ -449,10 +416,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;