* 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 <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";
module->psz_object_name = module->psz_longname = default_name;
module->psz_capability = "";
module->i_score = 1;
+ module->i_config_items = module->i_bool_items = 0;
+
return module;
}
case VLC_MODULE_PROGRAM:
msg_Warn (module, "deprecated module property %d", propid);
- return 0;
+ break;
default:
msg_Err (module, "unknown module property %d", propid);
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;
}
-int vlc_config_set (module_config_t *restrict item, vlc_config_t id, ...)
+int vlc_config_set (module_config_t *restrict item, int id, ...)
{
int ret = -1;
va_list ap;
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;
}
{
if (IsConfigIntegerType (item->i_type))
{
+ 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;
}
{
const char *value = va_arg (ap, const char *);
item->value.psz = value ? strdup (value) : NULL;
+ item->orig.psz = value ? strdup (value) : NULL;
+ item->saved.psz = value ? strdup (value) : NULL;
ret = 0;
}
break;
item->b_internal = VLC_TRUE;
ret = 0;
break;
+
+ case VLC_CONFIG_REMOVED:
+ item->b_removed = VLC_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_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))
+ {
+ const int *src = va_arg (ap, const int *);
+ int *dst = malloc (sizeof (int) * (len + 1));
+
+ if (dst != NULL)
+ {
+ memcpy (dst, src, sizeof (int) * len);
+ dst[len] = 0;
+ }
+ 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 *);
+ char **dst = malloc (sizeof (char *) * (len + 1));
+
+ if (dst != NULL)
+ {
+ for (size_t i = 0; i < len; i++)
+ dst[i] = src[i] ? strdup (src[i]) : NULL;
+ dst[len] = NULL;
+ }
+ item->ppsz_list = dst;
+ }
+ else
+ break;
+
+ /* Copy textual descriptions */
+ 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;
+ item->ppsz_list_text = dtext;
+ }
+ else
+ {
+ free (dtext);
+ item->ppsz_list_text = NULL;
+ }
+
+ item->i_list = len;
+ 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_unsafe = VLC_TRUE;
+ ret = 0;
+ break;
}
va_end (ap);