-#define add_string( name, psz_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value }; tmp.b_advanced = advc; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; }
-#define add_file( name, psz_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, '\0', text, longtext, psz_value, 0, 0 }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_directory( name, psz_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_DIRECTORY, NULL, name, '\0', text, longtext, psz_value, 0, 0 }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_module( name, psz_caps, psz_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_integer( name, i_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_key( name, i_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_KEY, NULL, name, '\0', text, longtext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_integer_with_range( name, i_value, i_min, i_max, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value, 0, i_min, i_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_float( name, f_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_float_with_range( name, f_value, f_min, f_max, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value, 0, 0, f_min, f_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-#define add_bool( name, b_value, p_callback, text, longtext, advc ) \
- i_config++; \
- if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
- (i_config+11) * sizeof(module_config_t)); \
- { static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, '\0', text, longtext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
+#define add_string( name, value, p_callback, text, longtext, advc ) \
+ add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, p_callback, value )
+
+#define add_file( name, value, p_callback, text, longtext, advc ) \
+ add_string_inner( CONFIG_ITEM_FILE, name, text, longtext, advc, p_callback, value )
+
+#define add_directory( name, value, p_callback, text, longtext, advc ) \
+ add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, p_callback, value )
+
+#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 ); \
+ p_config[i_config].psz_type = 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].i_min = 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 ); \
+ p_config[i_config].psz_type = psz_caps
+
+#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].i_min = i_subcategory /* gruik */
+
+#define add_integer( name, value, p_callback, text, longtext, advc ) \
+ add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, p_callback, value )
+
+#define add_key( name, value, p_callback, text, longtext, advc ) \
+ add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, value )
+
+#define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
+ add_integer( name, value, p_callback, text, longtext, advc ); \
+ change_integer_range( i_min, i_max )
+
+#define add_float( name, value, p_callback, text, longtext, advc ) \
+ add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc, p_callback ); \
+ p_config[i_config].f_value = value
+
+#define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
+ add_float( name, value, p_callback, text, longtext, advc ); \
+ change_float_range( f_min, f_max )
+
+#define add_bool( name, value, p_callback, text, longtext, advc ) \
+ add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, p_callback ); \
+ p_config[i_config].i_value = value
+
+/* For renamed option */
+#define add_deprecated( name, strict ) \
+ add_config_inner( ); \
+ p_config[ i_config ].i_type = p_config[ i_config -1 ].i_type; \
+ p_config[ i_config ].psz_name = name; \
+ p_config[i_config].b_strict = strict; \
+ p_config[ i_config ].psz_current = p_config[ i_config-1].psz_current \
+ ? p_config[ i_config-1 ].psz_current \
+ : p_config[ i_config-1 ].psz_name;
+
+/* For removed option */
+#define add_suppressed_inner( name, type ) \
+ add_type_inner( type ); \
+ p_config[ i_config ].psz_name = name; \
+ p_config[ i_config ].psz_current = "SUPPRESSED";
+
+#define add_suppressed_bool( name ) \
+ add_suppressed_inner( name, CONFIG_ITEM_BOOL )
+
+#define add_suppressed_integer( name ) \
+ add_suppressed_inner( name, CONFIG_ITEM_INTEGER )
+
+#define add_suppressed_float( name ) \
+ add_suppressed_inner( name, CONFIG_ITEM_FLOAT )
+
+#define add_suppressed_string( name ) \
+ add_suppressed_inner( name, CONFIG_ITEM_STRING )