/*****************************************************************************
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <assert.h>
#include <stdarg.h>
#include "modules/modules.h"
-#include "config/config.h"
+#include "config/configuration.h"
#include "libvlc.h"
static const char default_name[] = "unnamed";
if (module == NULL)
return NULL;
- module->b_reentrant = module->b_unloadable = VLC_TRUE;
- module->psz_object_name = module->psz_longname = default_name;
- module->psz_capability = "";
+ module->b_reentrant = module->b_unloadable = true;
+ module->psz_object_name = strdup( default_name );
+ module->psz_longname = default_name;
+ module->psz_capability = (char*)"";
module->i_score = 1;
+ module->i_config_items = module->i_bool_items = 0;
+
return module;
}
return NULL;
vlc_object_attach (submodule, module);
- submodule->b_submodule = VLC_TRUE;
+ submodule->b_submodule = true;
/* Muahahaha! Heritage! Polymorphism! Ugliness!! */
memcpy (submodule->pp_shortcuts, module->pp_shortcuts,
sizeof (submodule->pp_shortcuts));
- 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;
}
-int vlc_module_set (module_t *module, int propid, void *value)
+int vlc_module_set (module_t *module, int propid, ...)
{
+ va_list ap;
+ int ret = VLC_SUCCESS;
+
+ va_start (ap, propid);
switch (propid)
{
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;
+ {
+ ret = VLC_ENOMEM;
+ 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;
+ module->psz_shortname = va_arg (ap, char *);
break;
case VLC_MODULE_DESCRIPTION:
- module->psz_longname = (char *)value;
+ module->psz_longname = va_arg (ap, char *);
break;
case VLC_MODULE_HELP:
- module->psz_help = (char *)value;
+ module->psz_help = va_arg (ap, char *);
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] = value;
if (module->psz_longname == default_name)
- module->psz_longname = (char *)value;
+ module->psz_longname = value;
break;
+ }
case VLC_MODULE_PROGRAM:
msg_Warn (module, "deprecated module property %d", propid);
default:
msg_Err (module, "unknown module property %d", propid);
msg_Err (module, "LibVLC might be too old to use this module.");
- return VLC_EGENERIC;
+ ret = VLC_EGENERIC;
+ break;
}
- return 0;
+ va_end (ap);
+ return ret;
}
module_config_t *vlc_config_create (module_t *module, int type)
module->p_config = tab;
}
- module->confsize++;
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;
}
const char *text = va_arg (ap, const char *);
const char *longtext = va_arg (ap, const char *);
- item->psz_text = text ? strdup (gettext (text)) : NULL;
- item->psz_longtext = longtext ? strdup (gettext (text)) : NULL;
+ item->psz_text = text ? strdup ( _(text)) : NULL;
+ item->psz_longtext = longtext ? strdup ( _(longtext)) : NULL;
ret = 0;
break;
}
}
case VLC_CONFIG_ADVANCED:
- item->b_advanced = VLC_TRUE;
+ item->b_advanced = true;
ret = 0;
break;
case VLC_CONFIG_VOLATILE:
- item->b_unsaveable = VLC_TRUE;
+ item->b_unsaveable = true;
ret = 0;
break;
case VLC_CONFIG_PERSISTENT:
- item->b_autosave = VLC_TRUE;
+ item->b_autosave = true;
ret = 0;
break;
case VLC_CONFIG_RESTART:
- item->b_restart = VLC_TRUE;
+ item->b_restart = true;
ret = 0;
break;
case VLC_CONFIG_PRIVATE:
- item->b_internal = VLC_TRUE;
+ item->b_internal = true;
ret = 0;
break;
case VLC_CONFIG_REMOVED:
- item->psz_current = "SUPPRESSED";
+ item->b_removed = true;
ret = 0;
break;
if (text != NULL)
{
for (size_t i = 0; i < len; i++)
- dtext[i] = text[i] ? strdup (gettext (text[i])) : NULL;
+ 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;
+ item->pf_update_list = va_arg (ap, vlc_callback_t);
ret = 0;
break;
}
+
+ case VLC_CONFIG_ADD_ACTION:
+ {
+ vlc_callback_t cb = va_arg (ap, vlc_callback_t), *tabcb;
+ const char *name = va_arg (ap, const char *);
+ char **tabtext;
+
+ tabcb = realloc (item->ppf_action,
+ (item->i_action + 2) * sizeof (cb));
+ if (tabcb == NULL)
+ break;
+ item->ppf_action = tabcb;
+ tabcb[item->i_action] = cb;
+ tabcb[item->i_action + 1] = NULL;
+
+ tabtext = realloc (item->ppsz_action_text,
+ (item->i_action + 2) * sizeof (name));
+ if (tabtext == NULL)
+ break;
+ item->ppsz_action_text = tabtext;
+
+ if (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 = true;
+ ret = 0;
+ break;
}
va_end (ap);
projects / vlc / blobdiff