X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fentry.c;h=63e668fd9b7533a2fa586e61deee7dc7c7ddab1a;hb=a9b034cf7998a55b8403858e83ad481a803cf79d;hp=b1ee2b5a9b2873773fbf921c8bf20c0ab2665c09;hpb=3b055b72af869cf62a2d0724ddba9ed1a8011cb8;p=vlc

diff --git a/src/modules/entry.c b/src/modules/entry.c
index b1ee2b5a9b..63e668fd9b 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -18,11 +18,16 @@
  * 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.h"
+#include "modules/modules.h"
+#include "config/configuration.h"
 #include "libvlc.h"
 
 static const char default_name[] = "unnamed";
@@ -35,10 +40,13 @@ module_t *vlc_module_create (vlc_object_t *obj)
     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;
 }
 
@@ -55,13 +63,13 @@ module_t *vlc_submodule_create (module_t *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;
@@ -124,14 +132,16 @@ int vlc_module_set (module_t *module, int propid, void *value)
             break;
 
         case VLC_MODULE_NAME:
-            module->pp_shortcuts[0] = module->psz_object_name = (char *)value;
+            free( module->psz_object_name );
+            module->psz_object_name = strdup( (char *)value );
+            module->pp_shortcuts[0] = (char *)value;
             if (module->psz_longname == default_name)
                 module->psz_longname = (char *)value;
             break;
 
         case VLC_MODULE_PROGRAM:
             msg_Warn (module, "deprecated module property %d", propid);
-            return 0;
+            break;
 
         default:
             msg_Err (module, "unknown module property %d", propid);
@@ -141,7 +151,36 @@ int vlc_module_set (module_t *module, int propid, void *value)
     return 0;
 }
 
-int vlc_config_set (module_config_t *restrict item, vlc_config_t id, ...)
+module_config_t *vlc_config_create (module_t *module, int type)
+{
+    unsigned confsize = module->confsize;
+    module_config_t *tab = module->p_config;
+
+    if ((confsize & 0xf) == 0)
+    {
+        tab = realloc (tab, (confsize + 17) * sizeof (*tab));
+        if (tab == NULL)
+            return NULL;
+
+        module->p_config = tab;
+    }
+
+    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, int id, ...)
 {
     int ret = -1;
     va_list ap;
@@ -159,6 +198,7 @@ int vlc_config_set (module_config_t *restrict item, vlc_config_t id, ...)
             assert (name != NULL);
             item->psz_name = strdup (name);
             item->pf_callback = cb;
+            ret = 0;
             break;
         }
 
@@ -167,18 +207,217 @@ int vlc_config_set (module_config_t *restrict item, vlc_config_t id, ...)
             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_VALUE:
+        {
+            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;
+            }
+            else
+            if (IsConfigStringType (item->i_type))
+            {
+                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;
+        }
+
         case VLC_CONFIG_RANGE:
-        case VLC_CONFIG_STEP:
+        {
+            if (IsConfigIntegerType (item->i_type))
+            {
+                item->min.i = va_arg (ap, int);
+                item->max.i = va_arg (ap, int);
+                ret = 0;
+            }
+            else
+            if (IsConfigFloatType (item->i_type))
+            {
+                item->min.f = va_arg (ap, double);
+                item->max.f = va_arg (ap, double);
+                ret = 0;
+            }
+            break;
+        }
+
         case VLC_CONFIG_ADVANCED:
+            item->b_advanced = true;
+            ret = 0;
+            break;
+
         case VLC_CONFIG_VOLATILE:
+            item->b_unsaveable = true;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_PERSISTENT:
+            item->b_autosave = true;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_RESTART:
+            item->b_restart = true;
+            ret = 0;
+            break;
+
         case VLC_CONFIG_PRIVATE:
+            item->b_internal = true;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_REMOVED:
+            item->b_removed = 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;
+            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;
     }