Changeset 1f9d8d6cc17156bbf51e76f71cbb8367594d6c8a

Timestamp:

16/12/07 15:34:29 (10 months ago)

Author:

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

git-committer:

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

git-parent:

[f756ebd7197ef940aead1ac78865c6bb58d0e502]

git-author:

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

Message:

Migrate module, module_list and obsolete_* to vlc_config_set

Files:

• include/vlc_configuration.h (modified) (4 diffs)
• src/config/core.c (modified) (2 diffs)
• src/modules/entry.c (modified) (1 diff)

include/vlc_configuration.h

@@ -236 +236 @@
-    /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
-     * Append new items at the end ONLY. */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-} vlc_config_t;
-
@@ -335 +359 @@
-#define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, p_callback, value ); \
-
+
+
-
-#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
@@ -343 +368 @@
-#define add_module_list( name, psz_caps, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_LIST, name, text, longtext, advc, p_callback, value ); \
-
+
+
-
-#define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
@@ -387 +413 @@
-    vlc_config_set (p_config + i_config, VLC_CONFIG_NAME, \
-                    (const char *)(name), (vlc_callback_t)NULL); \
-p_config[ i_config ].psz_current = "SUPPRESSED"
+vlc_config_set (p_config + i_config, VLC_CONFIG_REMOVED)
-
-#define add_obsolete_bool( name ) \

src/config/core.c

@@ -541 +541 @@
-        }
-
-strdupnull (p_orig[i].psz_type)
+p_orig[i].psz_type
-        p_module->p_config[i].psz_name = p_orig[i].psz_name;
-strdupnull (p_orig[i].psz_current)
+p_orig[i].psz_current
-        p_module->p_config[i].psz_text = p_orig[i].psz_text;
-        p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext;
@@ -629 +629 @@
-        free( (char*) p_item->psz_type );
-        free( (char*) p_item->psz_name );
-        free( (char*) p_item->psz_current );
-        free( (char*) p_item->psz_text );
-        free( (char*) p_item->psz_longtext );

src/modules/entry.c

@@ -260 +260 @@
-            ret = 0;
-            break;
+
+        case VLC_CONFIG_REMOVED:
+            item->psz_current = "SUPPRESSED";
+            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;
+        }
-    }
-