X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=9882c525cc24fcbd4303b4c850b7d18bc5b17226;hb=ec3df8f49c7d48389c79226db6acf00a511e7e0e;hp=148d6edebf99c30c7be6458f9fbf4096c9fd217a;hpb=1b8b05c72297c19f04b2472f1ad3f04b91cecd9a;p=vlc

diff --git a/src/config/core.c b/src/config/core.c
index 148d6edebf..9882c525cc 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -354,7 +354,11 @@ ssize_t config_GetIntChoices (vlc_object_t *obj, const char *name,
 
     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);
@@ -363,7 +367,8 @@ ssize_t config_GetIntChoices (vlc_object_t *obj, const char *name,
     {
         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 ();
     }
@@ -374,6 +379,38 @@ ssize_t config_GetIntChoices (vlc_object_t *obj, const char *name,
 }
 
 
+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]
@@ -391,11 +428,23 @@ ssize_t config_GetPszChoices (vlc_object_t *obj, const char *name,
     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)
     {
@@ -409,11 +458,10 @@ ssize_t config_GetPszChoices (vlc_object_t *obj, const char *name,
 
     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;
@@ -446,12 +494,9 @@ static struct
  */
 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;
 
@@ -530,6 +575,12 @@ void config_Free (module_config_t *config, size_t 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);
@@ -541,8 +592,6 @@ void config_Free (module_config_t *config, size_t confsize)
                 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]);
@@ -558,12 +607,14 @@ void config_Free (module_config_t *config, size_t confsize)
  *****************************************************************************/
 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;
@@ -581,7 +632,9 @@ void config_ResetAll( vlc_object_t *p_this )
                         strdupnull (p_config->orig.psz);
             }
         }
+    }
     vlc_rwlock_unlock (&config_lock);
 
     module_list_free (list);
+    VLC_UNUSED(p_this);
 }