X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=c97739dbd8ca7c69622dd4d9305814692ab84bac;hb=33692d21e5811e204c53f84b91ba3b73923d7dbb;hp=52ca2e6f7863ac43838dfe493f535f12026c8b0c;hpb=b803dd3a498e4a88363944e8d3ed191febdd7860;p=vlc diff --git a/src/modules/entry.c b/src/modules/entry.c index 52ca2e6f78..c97739dbd8 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -1,7 +1,8 @@ /***************************************************************************** * entry.c : Callbacks for module entry point ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team + * Copyright (C) 2007 the VideoLAN team + * Copyright © 2007-2008 Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +23,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -30,163 +32,216 @@ #include "config/configuration.h" #include "libvlc.h" +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); +} + static const char default_name[] = "unnamed"; module_t *vlc_module_create (vlc_object_t *obj) { - module_t *module = - (module_t *)vlc_custom_create (obj, sizeof (module_t), - VLC_OBJECT_MODULE, "module"); + module_t *module = malloc (sizeof (*module)); if (module == NULL) return NULL; - module->b_reentrant = module->b_unloadable = VLC_TRUE; - module->psz_object_name = module->psz_longname = default_name; + module->psz_object_name = strdup( default_name ); + module->next = NULL; + module->submodule = NULL; + 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->psz_capability = (char*)""; module->i_score = 1; - module->i_config_items = module->i_bool_items = 0; - + module->i_cpu = 0; + module->b_unloadable = true; + module->b_reentrant = true; + module->b_submodule = false; + module->pf_activate = NULL; + module->pf_deactivate = NULL; + module->p_config = NULL; + module->confsize = 0; + module->i_config_items = 0; + module->i_bool_items = 0; + /*module->handle = garbage */ + module->psz_filename = NULL; + module->b_builtin = false; + module->b_loaded = false; + + (void)obj; return module; } +static void vlc_submodule_destruct (gc_object_t *obj) +{ + module_t *module = vlc_priv (obj, module_t); + free (module->psz_object_name); + free (module); +} + module_t *vlc_submodule_create (module_t *module) { assert (module != NULL); - assert (!module->b_submodule); // subsubmodules are not supported - module_t *submodule = - (module_t *)vlc_custom_create (VLC_OBJECT (module), sizeof (module_t), - VLC_OBJECT_MODULE, "submodule"); - if (submodule == NULL) + module_t *submodule = calloc( 1, sizeof(*submodule) ); + if( !submodule ) return NULL; - vlc_object_attach (submodule, module); - submodule->b_submodule = VLC_TRUE; + vlc_gc_init (submodule, vlc_submodule_destruct); + + submodule->next = module->submodule; + submodule->parent = module; + module->submodule = submodule; + 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 = module->psz_object_name; + 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; } +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)); + 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; +} + -int vlc_module_set (module_t *module, int propid, void *value) +int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...) { + va_list ap; + int ret = 0; + + va_start (ap, propid); switch (propid) { + 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_CPU_REQUIREMENT: assert (!module->b_submodule); - module->i_cpu |= (intptr_t)value; + 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)) - return VLC_ENOMEM; + if (i >= (MODULE_SHORTCUT_MAX - 1)) + break; - module->pp_shortcuts[i] = (char *)value; + module->pp_shortcuts[i] = va_arg (ap, char *); break; } - case VLC_MODULE_SHORTNAME: - module->psz_shortname = (char *)value; - break; - - case VLC_MODULE_DESCRIPTION: - module->psz_longname = (char *)value; - break; - - case VLC_MODULE_HELP: - module->psz_help = (char *)value; - break; - case VLC_MODULE_CAPABILITY: - module->psz_capability = (char *)value; + module->psz_capability = va_arg (ap, char *); break; case VLC_MODULE_SCORE: - module->i_score = (intptr_t)value; + module->i_score = va_arg (ap, int); break; case VLC_MODULE_CB_OPEN: - module->pf_activate = (int (*) (vlc_object_t *))value; + module->pf_activate = va_arg (ap, int (*) (vlc_object_t *)); break; case VLC_MODULE_CB_CLOSE: - module->pf_deactivate = (void (*) (vlc_object_t *))value; + module->pf_deactivate = va_arg (ap, void (*) (vlc_object_t *)); break; - case VLC_MODULE_UNLOADABLE: - module->b_unloadable = (value != NULL); + case VLC_MODULE_NO_UNLOAD: + module->b_unloadable = false; break; case VLC_MODULE_NAME: - module->pp_shortcuts[0] = module->psz_object_name = (char *)value; + { + const char *value = va_arg (ap, const char *); + free( module->psz_object_name ); + module->psz_object_name = strdup( value ); + module->pp_shortcuts[0] = (char*)value; /* dooh! */ if (module->psz_longname == default_name) - module->psz_longname = (char *)value; + module->psz_longname = (char*)value; /* dooh! */ break; + } - case VLC_MODULE_PROGRAM: - msg_Warn (module, "deprecated module property %d", propid); + case VLC_MODULE_SHORTNAME: + module->psz_shortname = va_arg (ap, char *); break; - default: - msg_Err (module, "unknown module property %d", propid); - msg_Err (module, "LibVLC might be too old to use this module."); - return VLC_EGENERIC; - } - return 0; -} - -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->object_lock; - - if (type & CONFIG_ITEM) - { - module->i_config_items++; - if (type == CONFIG_ITEM_BOOL) - module->i_bool_items++; - } - - module->confsize++; - return tab + confsize; -} + case VLC_MODULE_DESCRIPTION: + module->psz_longname = va_arg (ap, char *); + break; -int vlc_config_set (module_config_t *restrict item, int id, ...) -{ - int ret = -1; - va_list ap; + case VLC_MODULE_HELP: + module->psz_help = va_arg (ap, char *); + break; - assert (item != NULL); - va_start (ap, id); + case VLC_MODULE_TEXTDOMAIN: + (void) va_arg (ap, const char *); + /* FIXME: not implemented */ + break; - switch (id) - { case VLC_CONFIG_NAME: { const char *name = va_arg (ap, const char *); @@ -195,18 +250,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) assert (name != NULL); item->psz_name = strdup (name); item->pf_callback = cb; - ret = 0; - break; - } - - case VLC_CONFIG_DESC: - { - const char *text = va_arg (ap, const char *); - const char *longtext = va_arg (ap, const char *); - - item->psz_text = text ? strdup ( _(text)) : NULL; - item->psz_longtext = longtext ? strdup ( _(longtext)) : NULL; - ret = 0; break; } @@ -216,14 +259,12 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) { 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)) @@ -232,79 +273,87 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) item->value.psz = value ? strdup (value) : NULL; item->orig.psz = value ? strdup (value) : NULL; item->saved.psz = value ? strdup (value) : NULL; - ret = 0; } break; } case VLC_CONFIG_RANGE: { - if (IsConfigIntegerType (item->i_type)) + if (IsConfigIntegerType (item->i_type) + || 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); - 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 = VLC_TRUE; - ret = 0; + item->b_advanced = true; break; case VLC_CONFIG_VOLATILE: - item->b_unsaveable = VLC_TRUE; - ret = 0; + item->b_unsaveable = true; break; case VLC_CONFIG_PERSISTENT: - item->b_autosave = VLC_TRUE; - ret = 0; + item->b_autosave = true; break; case VLC_CONFIG_RESTART: - item->b_restart = VLC_TRUE; - ret = 0; + item->b_restart = true; break; case VLC_CONFIG_PRIVATE: - item->b_internal = VLC_TRUE; - ret = 0; + item->b_internal = true; break; case VLC_CONFIG_REMOVED: - item->b_removed = VLC_TRUE; - ret = 0; + item->b_removed = true; 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; + break; + } + + case VLC_CONFIG_SAFE: + item->b_safe = true; + break; + + case VLC_CONFIG_DESC: + { + const char *text = va_arg (ap, const char *); + const char *longtext = va_arg (ap, const char *); + + item->psz_text = text ? strdup (text) : NULL; + item->psz_longtext = longtext ? strdup (longtext) : NULL; + break; + } + case VLC_CONFIG_LIST: { size_t len = va_arg (ap, size_t); - char **dtext = malloc (sizeof (char *) * (len + 1)); - - if (dtext == NULL) - break; /* Copy values */ if (IsConfigIntegerType (item->i_type)) @@ -320,21 +369,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) 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 *); @@ -355,20 +389,20 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) const char *const *text = va_arg (ap, const char *const *); if (text != NULL) { - for (size_t i = 0; i < len; i++) - dtext[i] = text[i] ? strdup ( _(text[i])) : NULL; - - dtext[len] = NULL; + char **dtext = malloc (sizeof (char *) * (len + 1)); + if( dtext != NULL ) + { + for (size_t i = 0; i < len; i++) + dtext[i] = text[i] ? strdup (text[i]) : NULL; + dtext[len] = NULL; + } item->ppsz_list_text = dtext; } else - { - free (dtext); item->ppsz_list_text = NULL; - } item->i_list = len; - ret = 0; + item->pf_update_list = va_arg (ap, vlc_callback_t); break; } @@ -393,27 +427,19 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) item->ppsz_action_text = tabtext; if (name) - tabtext[item->i_action] = strdup ( _(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; } - 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 = VLC_TRUE; - ret = 0; + default: + fprintf (stderr, "LibVLC: unknown module property %d\n", propid); + fprintf (stderr, "LibVLC: too old to use this module?\n"); + ret = -1; break; }