size_t count = cfg->list_count;
if (count == 0)
- return 0;
+ {
+ if (cfg->list.i_cb == NULL)
+ return 0;
+ return cfg->list.i_cb(obj, name, values, texts);
+ }
int64_t *vals = xmalloc (sizeof (*vals) * count);
char **txts = xmalloc (sizeof (*txts) * count);
{
vals[i] = cfg->list.i[i];
/* FIXME: use module_gettext() instead */
- txts[i] = strdup (vlc_gettext (cfg->list_text[i]));
+ txts[i] = strdup ((cfg->list_text[i] != NULL)
+ ? vlc_gettext (cfg->list_text[i]) : "");
if (unlikely(txts[i] == NULL))
abort ();
}
}
+static ssize_t config_ListModules (const char *cap, char ***restrict values,
+ char ***restrict texts)
+{
+ module_t **list;
+ ssize_t n = module_list_cap (&list, cap);
+ if (n <= 0)
+ {
+ *values = *texts = NULL;
+ return n;
+ }
+
+ char **vals = xmalloc ((n + 2) * sizeof (*vals));
+ char **txts = xmalloc ((n + 2) * sizeof (*txts));
+
+ vals[0] = xstrdup ("any");
+ txts[0] = xstrdup (_("Automatic"));
+
+ for (ssize_t i = 0; i < n; i++)
+ {
+ vals[i + 1] = xstrdup (module_get_object (list[i]));
+ txts[i + 1] = xstrdup (module_gettext (list[i],
+ module_get_name (list[i], true)));
+ }
+
+ vals[n + 1] = xstrdup ("none");
+ txts[n + 1] = xstrdup (_("Disable"));
+
+ *values = vals;
+ *texts = txts;
+ return n + 2;
+}
+
/**
* Determines a list of suggested values for a string configuration item.
* \param values pointer to a table of value strings [OUT]
module_config_t *cfg = config_FindConfig (obj, name);
if (cfg == NULL)
{
- msg_Warn (obj, "option %s does not exist", name);
errno = ENOENT;
return -1;
}
+ switch (cfg->i_type)
+ {
+ case CONFIG_ITEM_MODULE:
+ return config_ListModules (cfg->psz_type, values, texts);
+ default:
+ if (!IsConfigStringType (cfg->i_type))
+ {
+ errno = EINVAL;
+ return -1;
+ }
+ break;
+ }
+
size_t count = cfg->list_count;
if (count == 0)
{
for (size_t i = 0; i < count; i++)
{
- vals[i] = strdup (cfg->list.psz[i]);
+ vals[i] = xstrdup ((cfg->list.psz[i] != NULL) ? cfg->list.psz[i] : "");
/* FIXME: use module_gettext() instead */
- txts[i] = strdup (vlc_gettext(cfg->list_text[i]));
- if (unlikely(vals[i] == NULL || txts[i] == NULL))
- abort ();
+ txts[i] = xstrdup ((cfg->list_text[i] != NULL)
+ ? vlc_gettext (cfg->list_text[i]) : "");
}
*values = vals;
*/
int config_SortConfig (void)
{
- size_t nmod;
+ size_t nmod, nconf = 0;
module_t **mlist = module_list_get (&nmod);
- if (unlikely(mlist == NULL))
- return VLC_ENOMEM;
- size_t nconf = 0;
for (size_t i = 0; i < nmod; i++)
nconf += mlist[i]->confsize;
free( p_item->psz_text );
free( p_item->psz_longtext );
+ if (IsConfigIntegerType (p_item->i_type))
+ {
+ if (p_item->list_count)
+ free (p_item->list.i);
+ }
+ else
if (IsConfigStringType (p_item->i_type))
{
free (p_item->value.psz);
free (p_item->list.psz);
}
}
- else
- free (p_item->list.i);
for (size_t i = 0; i < p_item->list_count; i++)
free (p_item->list_text[i]);
*****************************************************************************/
void config_ResetAll( vlc_object_t *p_this )
{
- VLC_UNUSED(p_this);
- module_t *p_module;
- module_t **list = module_list_get (NULL);
+ size_t count;
+ module_t **list = module_list_get (&count);
vlc_rwlock_wrlock (&config_lock);
- for (size_t j = 0; (p_module = list[j]) != NULL; j++)
+ for (size_t j = 0; j < count; j++)
+ {
+ module_t *p_module = list[j];
+
for (size_t i = 0; i < p_module->confsize; i++ )
{
module_config_t *p_config = p_module->p_config + i;
strdupnull (p_config->orig.psz);
}
}
+ }
vlc_rwlock_unlock (&config_lock);
module_list_free (list);
+ VLC_UNUSED(p_this);
}