Changeset 0ed17f99bb99ca20fc26061a238a1ed051a21bd1

Timestamp:

12/15/07 23:18:03 (9 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1197757083 +0000

git-parent:

[417253217308d59d4073a2f3065d4510be343420]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1197757083 +0000

Message:

Continue the vlc_config_set stuff - still unfinished

Files:

• include/vlc_configuration.h (modified) (9 diffs)
• src/modules/entry.c (modified) (3 diffs)

include/vlc_configuration.h

@@ -150 +150 @@
-{
-    int          i_type;                               /* Configuration type */
-onst char
-onst char
+har      
+har      
-    char         i_short;                      /* Optional short option name */
-onst char
-onst char
+har      
+har      
-    module_value_t value;                                    /* Option value */
-    module_value_t orig;
@@ -240 +240 @@
-    VLC_CONFIG_VALUE,    /* actual value (args=<type>) */
-    VLC_CONFIG_RANGE,    /* minimum value (args=<type>, <type>) */
-    VLC_CONFIG_STEP,     /* interval value (args=<type>) */
-    VLC_CONFIG_ADVANCED, /* enable advanced flag (args=none) */
-    VLC_CONFIG_VOLATILE, /* don't write variable to storage (args=none) */
+    VLC_CONFIG_PERSISTENT, /* always write variable to storage (args=none) */
+    VLC_CONFIG_RESTART,  /* restart required to apply value change (args=none) */
-    VLC_CONFIG_PRIVATE,  /* hide from user (args=none) */
-} vlc_config_t;
@@ -280 +281 @@
-#define add_typeadv_inner( type, text, longtext, advc ) \
-    add_typedesc_inner( type, text, longtext ); \
-p_config[i_config].b_advanced = advc
+if (advc) vlc_config_set (p_config + i_config, VLC_CONFIG_ADVANCED)
-
-#define add_typename_inner( type, name, text, longtext, advc, cb ) \
@@ -289 +290 @@
-#define add_string_inner( type, name, text, longtext, advc, cb, v ) \
-    add_typename_inner( type, name, text, longtext, advc, cb ); \
-p_config[i_config].value.psz = v
+vlc_config_set (p_config + i_config, VLC_CONFIG_VALUE, (const char *)(v))
-
-#define add_int_inner( type, name, text, longtext, advc, cb, v ) \
-    add_typename_inner( type, name, text, longtext, advc, cb ); \
-p_config[i_config].value.i = v
+vlc_config_set (p_config + i_config, VLC_CONFIG_VALUE, (int)(v))
-
-
@@ -359 +360 @@
-#define add_float( name, v, p_callback, text, longtext, advc ) \
-    add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc, p_callback ); \
-p_config[i_config].value.f = v
+vlc_config_set (p_config + i_config, VLC_CONFIG_VALUE, (double)(v))
-
-#define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
@@ -373 +374 @@
-    add_config_inner( ); \
-    p_config[ i_config ].i_type = p_config[ i_config -1 ].i_type; \
-
+
+
-    p_config[i_config].b_strict = VLC_FALSE; \
-    p_config[ i_config ].psz_current = p_config[ i_config-1 ].psz_current \
@@ -382 +384 @@
-#define add_obsolete_inner( name, type ) \
-    add_type_inner( type ); \
-
-
+
+
+
-
-#define add_obsolete_bool( name ) \
@@ -412 +415 @@
-
-#define change_integer_range( minv, maxv ) \
-p_config[i_config].min.i = minv;
-p_config[i_config].max.i = maxv;
+vlc_config_set (p_config + i_config, VLC_CONFIG_RANGE,
+                (int)(minv), (int)(maxv))
-
-#define change_float_range( minv, maxv ) \
-p_config[i_config].min.f = minv;
-p_config[i_config].max.f = maxv;
+vlc_config_set (p_config + i_config, VLC_CONFIG_RANGE,
+                (double)(minv), (double)(maxv))
-
-#define change_action_add( pf_action, action_text ) \
@@ -435 +438 @@
-
-#define change_internal() \
-p_config[i_config].b_internal = VLC_TRUE;
+vlc_config_set (p_config + i_config, VLC_CONFIG_PRIVATE)
-
-#define change_need_restart() \
-p_config[i_config].b_restart = VLC_TRUE;
+vlc_config_set (p_config + i_config, VLC_CONFIG_RESTART)
-
-#define change_autosave() \
-p_config[i_config].b_autosave = VLC_TRUE;
+vlc_config_set (p_config + i_config, VLC_CONFIG_PERSISTENT)
-
-#define change_unsaveable() \
-p_config[i_config].b_unsaveable = VLC_TRUE;
+vlc_config_set (p_config + i_config, VLC_VOLATILE)
-
-/****************************************************************************

src/modules/entry.c

@@ -23 +23 @@
-#include <stdarg.h>
-
-
+
+
-#include "libvlc.h"
-
@@ -160 +161 @@
-            item->psz_name = strdup (name);
-            item->pf_callback = cb;
+            ret = 0;
-            break;
-        }
@@ -175 +177 @@
-
-        case VLC_CONFIG_VALUE:
+        {
+            if (IsConfigIntegerType (item->i_type))
+            {
+                item->value.i = va_arg (ap, int);
+                ret = 0;
+            }
+            else
+            if (IsConfigFloatType (item->i_type))
+            {
+                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;
+                ret = 0;
+            }
+            break;
+        }
+
-        case VLC_CONFIG_RANGE:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        case VLC_CONFIG_ADVANCED:
+            item->b_advanced = VLC_TRUE;
+            ret = 0;
+            break;
+
-        case VLC_CONFIG_VOLATILE:
+            item->b_unsaveable = VLC_TRUE;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_PERSISTENT:
+            item->b_autosave = VLC_TRUE;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_RESTART:
+            item->b_restart = VLC_TRUE;
+            ret = 0;
+            break;
+
-        case VLC_CONFIG_PRIVATE:
+            item->b_internal = VLC_TRUE;
+            ret = 0;
-            break;
-    }