Commit 0babda75 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Don't use enums. They are cool and all (the compiler even tells when one case...

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.
parent 514ab9ef
...@@ -231,7 +231,7 @@ VLC_EXPORT( vlc_bool_t, __config_ExistIntf, ( vlc_object_t *, const char * ) ); ...@@ -231,7 +231,7 @@ VLC_EXPORT( vlc_bool_t, __config_ExistIntf, ( vlc_object_t *, const char * ) );
#define config_RemoveIntf(a,b) __config_RemoveIntf(VLC_OBJECT(a),b) #define config_RemoveIntf(a,b) __config_RemoveIntf(VLC_OBJECT(a),b)
#define config_ExistIntf(a,b) __config_ExistIntf(VLC_OBJECT(a),b) #define config_ExistIntf(a,b) __config_ExistIntf(VLC_OBJECT(a),b)
typedef enum vlc_config_properties enum vlc_config_properties
{ {
/* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI! /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
* Append new items at the end ONLY. */ * Append new items at the end ONLY. */
...@@ -268,11 +268,11 @@ typedef enum vlc_config_properties ...@@ -268,11 +268,11 @@ typedef enum vlc_config_properties
VLC_CONFIG_CAPABILITY, VLC_CONFIG_CAPABILITY,
/* capability for a module or list thereof (args=const char*) */ /* 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_EXPORT( module_config_t *, vlc_config_create, (module_t *, int type) );
VLC_EXPORT( int, vlc_config_set, (module_config_t *, vlc_config_t, ...) ); VLC_EXPORT( int, vlc_config_set, (module_config_t *, int, ...) );
/***************************************************************************** /*****************************************************************************
* Macros used to build the configuration structure. * Macros used to build the configuration structure.
...@@ -361,18 +361,20 @@ VLC_EXPORT( int, vlc_config_set, (module_config_t *, vlc_config_t, ...) ); ...@@ -361,18 +361,20 @@ VLC_EXPORT( int, vlc_config_set, (module_config_t *, vlc_config_t, ...) );
vlc_config_set (p_config + i_config, VLC_CONFIG_CAPABILITY, \ vlc_config_set (p_config + i_config, VLC_CONFIG_CAPABILITY, \
(const char *)(psz_caps)) (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 ) \ #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 ); \ add_string_inner( CONFIG_ITEM_MODULE_LIST, name, text, longtext, advc, p_callback, value ); \
vlc_config_set (p_config + i_config, VLC_CONFIG_CAPABILITY, \ vlc_config_set (p_config + i_config, VLC_CONFIG_CAPABILITY, \
(const char *)(psz_caps)) (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 ) \ #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 ); \ add_string_inner( CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, advc, p_callback, value ); \
p_config[i_config].min.i = i_subcategory /* gruik */ p_config[i_config].min.i = i_subcategory /* gruik */
#endif
#define add_integer( name, value, p_callback, text, longtext, advc ) \ #define add_integer( name, value, p_callback, text, longtext, advc ) \
add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, p_callback, value ) add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, p_callback, value )
......
...@@ -71,7 +71,7 @@ enum vlc_module_properties ...@@ -71,7 +71,7 @@ enum vlc_module_properties
VLC_MODULE_CB_OPEN, VLC_MODULE_CB_OPEN,
VLC_MODULE_CB_CLOSE, VLC_MODULE_CB_CLOSE,
VLC_MODULE_UNLOADABLE, VLC_MODULE_UNLOADABLE,
VLC_MODULE_NAME VLC_MODULE_NAME,
}; };
VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *m, const char *cap ) ); VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *m, const char *cap ) );
......
...@@ -132,7 +132,7 @@ int vlc_module_set (module_t *module, int propid, void *value) ...@@ -132,7 +132,7 @@ int vlc_module_set (module_t *module, int propid, void *value)
case VLC_MODULE_PROGRAM: case VLC_MODULE_PROGRAM:
msg_Warn (module, "deprecated module property %d", propid); msg_Warn (module, "deprecated module property %d", propid);
return 0; break;
default: default:
msg_Err (module, "unknown module property %d", propid); msg_Err (module, "unknown module property %d", propid);
...@@ -161,7 +161,7 @@ module_config_t *vlc_config_create (module_t *module, int type) ...@@ -161,7 +161,7 @@ module_config_t *vlc_config_create (module_t *module, int type)
return tab + confsize; return tab + confsize;
} }
int vlc_config_set (module_config_t *restrict item, vlc_config_t id, ...) int vlc_config_set (module_config_t *restrict item, int id, ...)
{ {
int ret = -1; int ret = -1;
va_list ap; va_list ap;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment