#include <vlc_memory.h>
#include <assert.h>
#include <stdarg.h>
+#include <limits.h>
#include "modules/modules.h"
#include "config/configuration.h"
{
module_t *module = vlc_priv (obj, module_t);
- vlc_mutex_destroy (&module->lock);
+ free (module->pp_shortcuts);
free (module->psz_object_name);
free (module);
}
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->b_unloadable = true;
module->i_bool_items = 0;
/*module->handle = garbage */
module->psz_filename = NULL;
+ module->domain = NULL;
module->b_builtin = false;
module->b_loaded = false;
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);
}
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_capability = module->psz_capability;
submodule->i_score = module->i_score;
submodule->b_submodule = true;
+ submodule->domain = module->domain;
return submodule;
}
}
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)
{
{
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_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;
}
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:
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;
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:
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))
|| 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))