Changeset 0babda75f1d5df89261dc5fa4e98f57f3ef9de77

Timestamp:

12/16/07 16:12:51 (9 months ago)

Author:

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

git-committer:

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

git-parent:

[514ab9ef4abf5e361fed91424a3b2cc5ee2e530d]

git-author:

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

Message:

Don't use enums. They are cool and all (the compiler even tells when one case is missing in switch), but I don't want the compiler to assume as yet unassigned codepoints will not be used.

Files:

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

include/vlc_configuration.h

@@ -232 +232 @@
-#define config_ExistIntf(a,b) __config_ExistIntf(VLC_OBJECT(a),b)
-
-typedef 
+
-{
-    /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
@@ -269 +269 @@
-    VLC_CONFIG_CAPABILITY,
-    /* capability for a module or list thereof (args=const char*) */
- vlc_config_t
+
-
-
-VLC_EXPORT( module_config_t *, vlc_config_create, (module_t *, int type) );
-vlc_config_
+in
-
-/*****************************************************************************
@@ -362 +362 @@
-                    (const char *)(psz_caps))
-
-#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_CAT, name, text, longtext, advc, p_callback, value ); \
-    p_config[i_config].min.i = i_subcategory /* gruik */
-
-#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 ); \
@@ -371 +367 @@
-                    (const char *)(psz_caps))
-
+#ifndef __PLUGIN__
+#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
+    add_string_inner( CONFIG_ITEM_MODULE_CAT, name, text, longtext, advc, p_callback, value ); \
+    p_config[i_config].min.i = i_subcategory /* gruik */
+
-#define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, advc, p_callback, value ); \
-    p_config[i_config].min.i = i_subcategory /* gruik */
+#endif
-
-#define add_integer( name, value, p_callback, text, longtext, advc ) \

include/vlc_modules.h

@@ -72 +72 @@
-    VLC_MODULE_CB_CLOSE,
-    VLC_MODULE_UNLOADABLE,
-
+,
-};
-

src/modules/entry.c

@@ -133 +133 @@
-        case VLC_MODULE_PROGRAM:
-            msg_Warn (module, "deprecated module property %d", propid);
-return 0
+break
-
-        default:
@@ -162 +162 @@
-}
-
-vlc_config_
+in
-{
-    int ret = -1;