X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfiguration.h;h=087c2b73517bd516a3734889089c8a6843fa45bb;hb=d8674c50bfc543608b99b76ec910b5fb489b337d;hp=bbdda91e26116b7cc1c87b546c4aae1f4288bf71;hpb=d2adc9f3c197dfb3b148db04d24f838d7f0befcd;p=vlc diff --git a/include/configuration.h b/include/configuration.h index bbdda91e26..087c2b7351 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -3,7 +3,7 @@ * This file describes the programming interface for the configuration module. * It includes functions allowing to declare, get or set configuration options. ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN + * Copyright (C) 1999-2006 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -30,7 +30,6 @@ /* Configuration hint types */ -#define CONFIG_HINT_END 0x0001 /* End of config */ #define CONFIG_HINT_CATEGORY 0x0002 /* Start of new category */ #define CONFIG_HINT_SUBCATEGORY 0x0003 /* Start of sub-category */ #define CONFIG_HINT_SUBCATEGORY_END 0x0004 /* End of sub-category */ @@ -57,13 +56,42 @@ #define CONFIG_ITEM 0x00F0 +/* Item types that use a string value (i.e. serialized in the module cache) */ +#define CONFIG_STRING_TYPES \ + { \ + CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE, \ + CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, \ + CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT \ + } + +static inline int IsConfigStringType (int type) +{ + const unsigned char config_string_types[] = CONFIG_STRING_TYPES; + + /* NOTE: this needs to be changed if we ever get more than 255 types */ + return memchr (config_string_types, type, sizeof (config_string_types)) + != NULL; +} + +static inline int IsConfigIntegerType (int type) +{ + return (type == CONFIG_ITEM_INTEGER) || (type == CONFIG_ITEM_KEY) + || (type == CONFIG_ITEM_BOOL); +} + +static inline int IsConfigFloatType (int type) +{ + return type == CONFIG_ITEM_FLOAT; +} + /******************************************************************* * All predefined categories and subcategories *******************************************************************/ #define CAT_INTERFACE 1 #define SUBCAT_INTERFACE_GENERAL 101 - #define SUBCAT_INTERFACE_CONTROL 102 - #define SUBCAT_INTERFACE_HOTKEYS 103 + #define SUBCAT_INTERFACE_MAIN 102 + #define SUBCAT_INTERFACE_CONTROL 103 + #define SUBCAT_INTERFACE_HOTKEYS 104 #define CAT_AUDIO 2 #define SUBCAT_AUDIO_GENERAL 201 @@ -78,14 +106,16 @@ #define SUBCAT_VIDEO_VFILTER 303 #define SUBCAT_VIDEO_TEXT 304 #define SUBCAT_VIDEO_SUBPIC 305 + #define SUBCAT_VIDEO_VFILTER2 306 #define CAT_INPUT 4 - #define SUBCAT_INPUT_ACCESS 401 - #define SUBCAT_INPUT_DEMUX 402 - #define SUBCAT_INPUT_VCODEC 403 - #define SUBCAT_INPUT_ACODEC 404 - #define SUBCAT_INPUT_SCODEC 405 - #define SUBCAT_INPUT_ADVANCED 406 + #define SUBCAT_INPUT_GENERAL 401 + #define SUBCAT_INPUT_ACCESS 402 + #define SUBCAT_INPUT_ACCESS_FILTER 403 + #define SUBCAT_INPUT_DEMUX 404 + #define SUBCAT_INPUT_VCODEC 405 + #define SUBCAT_INPUT_ACODEC 406 + #define SUBCAT_INPUT_SCODEC 407 #define CAT_SOUT 5 #define SUBCAT_SOUT_GENERAL 501 @@ -110,50 +140,67 @@ struct config_category_t { int i_id; - char *psz_name; - char *psz_help; + const char *psz_name; + const char *psz_help; }; +typedef union +{ + const char *psz; + int i; + float f; +} module_value_t; + +typedef union +{ + int i; + float f; +} module_nvalue_t; + struct module_config_t { int i_type; /* Configuration type */ - char *psz_type; /* Configuration subtype */ - char *psz_name; /* Option name */ + const char *psz_type; /* Configuration subtype */ + const char *psz_name; /* Option name */ char i_short; /* Optional short option name */ - char *psz_text; /* Short comment on the configuration option */ - char *psz_longtext; /* Long comment on the configuration option */ - char *psz_value; /* Option value */ - int i_value; /* Option value */ - float f_value; /* Option value */ - int i_min; /* Option minimum value */ - int i_max; /* Option maximum value */ - float f_min; /* Option minimum value */ - float f_max; /* Option maximum value */ + const char *psz_text; /* Short comment on the configuration option */ + const char *psz_longtext; /* Long comment on the configuration option */ + module_value_t value; /* Option value */ + module_value_t orig; + module_value_t saved; + module_nvalue_t min; + module_nvalue_t max; /* Function to call when commiting a change */ vlc_callback_t pf_callback; void *p_callback_data; /* Values list */ - char **ppsz_list; /* List of possible values for the option */ + const char **ppsz_list; /* List of possible values for the option */ int *pi_list; /* Idem for integers */ - char **ppsz_list_text; /* Friendly names for list values */ + const char **ppsz_list_text; /* Friendly names for list values */ int i_list; /* Options list size */ /* Actions list */ vlc_callback_t *ppf_action; /* List of possible actions for a config */ - char **ppsz_action_text; /* Friendly names for actions */ + const char **ppsz_action_text; /* Friendly names for actions */ int i_action; /* actions list size */ /* Misc */ vlc_mutex_t *p_lock; /* Lock to use when modifying the config */ vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */ vlc_bool_t b_advanced; /* Flag to indicate an advanced option */ + vlc_bool_t b_internal; /* Flag to indicate option is not to be shown */ + vlc_bool_t b_restart; /* Flag to indicate the option need a restart */ + /* to take effect */ - /* Original option values */ - char *psz_value_orig; - int i_value_orig; - float f_value_orig; + /* Deprecated */ + const char *psz_current; /* Good option name */ + vlc_bool_t b_strict; /* Transitionnal or strict */ + + /* Option values loaded from config file */ + vlc_bool_t b_autosave; /* Config will be auto-saved at exit time */ + vlc_bool_t b_unsaveable; /* confg should be saved*/ }; /***************************************************************************** @@ -170,6 +217,8 @@ VLC_EXPORT( void, __config_PutPsz, (vlc_object_t *, const char *, const char VLC_EXPORT( int, __config_LoadCmdLine, ( vlc_object_t *, int *, char *[], vlc_bool_t ) ); VLC_EXPORT( char *, config_GetHomeDir, ( void ) ); +VLC_EXPORT( char *, config_GetUserDir, ( void ) ); +VLC_EXPORT( const char *, config_GetDataDir, ( const vlc_object_t * ) ); VLC_EXPORT( int, __config_LoadConfigFile, ( vlc_object_t *, const char * ) ); VLC_EXPORT( int, __config_SaveConfigFile, ( vlc_object_t *, const char * ) ); VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) ); @@ -177,11 +226,11 @@ VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) ); VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) ); VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) ); -VLC_EXPORT( void, config_Duplicate, ( module_t *, module_config_t * ) ); +VLC_EXPORT( int, config_Duplicate, ( module_t *, const module_config_t *, size_t ) ); void config_Free ( module_t * ); -VLC_EXPORT( void, config_SetCallbacks, ( module_config_t *, module_config_t * ) ); -VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); +VLC_EXPORT( void, config_SetCallbacks, ( module_config_t *, module_config_t *, size_t ) ); +VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t *, size_t ) ); #define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b) #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b) @@ -197,12 +246,13 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); #define config_ResetAll(a) __config_ResetAll(VLC_OBJECT(a)) /* internal only */ -int config_CreateDir( vlc_object_t *, char * ); +int config_CreateDir( vlc_object_t *, const char * ); +int config_AutoSaveConfigFile( vlc_object_t * ); /***************************************************************************** * Macros used to build the configuration structure. * - * Note that internally we support only 3 types of config data: int , float + * Note that internally we support only 3 types of config data: int, float * and string. * The other types declared here just map to one of these 3 basic types but * have the advantage of also providing very good hints to a configuration @@ -212,125 +262,137 @@ int config_CreateDir( vlc_object_t *, char * ); * allow for a more user friendly interface. *****************************************************************************/ -#define set_category( i_id ) \ +#define add_config_inner( ) \ 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_CATEGORY, NULL, NULL , '\0', NULL, NULL, NULL, i_id }; p_config[ i_config ] = tmp; } + if( (i_config % 10) == 0 ) \ + p_config = (module_config_t *) \ + realloc(p_config, (i_config+11) * sizeof(module_config_t)); \ + memset( p_config + i_config, 0, sizeof( *p_config ) ) + +#define add_type_inner( type ) \ + add_config_inner( ); \ + p_config[i_config].i_type = type + +#define add_typedesc_inner( type, text, longtext ) \ + add_type_inner( type ); \ + p_config[i_config].psz_text = text; \ + p_config[i_config].psz_longtext = longtext + +#define add_typeadv_inner( type, text, longtext, advc ) \ + add_typedesc_inner( type, text, longtext ); \ + p_config[i_config].b_advanced = advc + +#define add_typename_inner( type, name, text, longtext, advc, cb ) \ + add_typeadv_inner( type, text, longtext, advc ); \ + p_config[i_config].psz_name = name; \ + p_config[i_config].pf_callback = cb + +#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 + +#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 + + +#define set_category( i_id ) \ + add_type_inner( CONFIG_CATEGORY ); \ + p_config[i_config].value.i = i_id #define set_subcategory( i_id ) \ - 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_SUBCATEGORY, NULL, NULL , '\0', NULL, NULL, NULL, i_id }; p_config[ i_config ] = tmp; } + add_type_inner( CONFIG_SUBCATEGORY ); \ + p_config[i_config].value.i = i_id -#define set_section( text, longtext) \ - 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_SECTION, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } +#define set_section( text, longtext ) \ + add_typedesc_inner( CONFIG_SECTION, text, longtext ) #define add_category_hint( 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_HINT_CATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; p_config[i_config].b_advanced = advc; } + add_typeadv_inner( CONFIG_HINT_CATEGORY, text, longtext, advc ) #define add_subcategory_hint( text, longtext ) \ - 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_HINT_SUBCATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } - + add_typedesc_inner( CONFIG_HINT_SUBCATEGORY, text, longtext ) #define end_subcategory_hint \ - 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_HINT_SUBCATEGORY_END, NULL, NULL, '\0' }; p_config[ i_config ] = tmp; } + add_type_inner( CONFIG_HINT_SUBCATEGORY_END ) + #define add_usage_hint( text ) \ - 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_HINT_USAGE, NULL, NULL, '\0', text }; p_config[ i_config ] = tmp; } + add_typedesc_inner( CONFIG_HINT_USAGE, text, NULL ) +#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_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_file( name, value, p_callback, text, longtext, advc ) \ + add_string_inner( CONFIG_ITEM_FILE, name, text, longtext, advc, p_callback, value ) -#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_directory( name, value, p_callback, text, longtext, advc ) \ + add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, p_callback, value ) -#define add_module_cat( name, i_subcategory, 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_CAT, NULL, name, '\0', text, longtext, psz_value, 0, 0.0, i_subcategory }; 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, 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_list( 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_LIST, 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_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 ); \ + p_config[i_config].psz_type = psz_caps -#define add_module_list_cat( name, i_subcategory, 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_LIST_CAT, NULL, name, '\0', text, longtext, psz_value, 0, 0.0, i_subcategory }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = 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 ); \ + p_config[i_config].min.i = i_subcategory /* gruik */ -#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_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, 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_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, 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_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, 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( 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 -#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_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, 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_bool( name, v, p_callback, text, longtext, advc ) \ + add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, p_callback ); \ + p_config[i_config].value.i = v + +/* 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 ) /* Modifier macros for the config options (used for fine tuning) */ #define change_short( ch ) \ @@ -343,16 +405,16 @@ int config_CreateDir( vlc_object_t *, char * ); #define change_integer_list( list, list_text, list_update_func ) \ p_config[i_config].i_list = sizeof(list)/sizeof(int); \ - p_config[i_config].pi_list = list; \ + p_config[i_config].pi_list = (int *)list; \ p_config[i_config].ppsz_list_text = list_text; -#define change_integer_range( min, max ) \ - p_config[i_config].i_min = min; \ - p_config[i_config].i_max = max; +#define change_integer_range( minv, maxv ) \ + p_config[i_config].min.i = minv; \ + p_config[i_config].max.i = maxv; -#define change_float_range( min, max ) \ - p_config[i_config].f_min = min; \ - p_config[i_config].f_max = max; +#define change_float_range( minv, maxv ) \ + p_config[i_config].min.f = minv; \ + p_config[i_config].max.f = maxv; #define change_action_add( pf_action, action_text ) \ if( !p_config[i_config].i_action ) \ @@ -361,10 +423,63 @@ int config_CreateDir( vlc_object_t *, char * ); p_config[i_config].ppf_action = (vlc_callback_t *) \ realloc( p_config[i_config].ppf_action, \ (p_config[i_config].i_action + 1) * sizeof(void *) ); \ - p_config[i_config].ppsz_action_text = (char **)\ + p_config[i_config].ppsz_action_text = (const char **)\ realloc( p_config[i_config].ppsz_action_text, \ (p_config[i_config].i_action + 1) * sizeof(void *) ); \ p_config[i_config].ppf_action[p_config[i_config].i_action] = pf_action; \ p_config[i_config].ppsz_action_text[p_config[i_config].i_action] = \ action_text; \ p_config[i_config].i_action++; + +#define change_internal() \ + p_config[i_config].b_internal = VLC_TRUE; + +#define change_need_restart() \ + p_config[i_config].b_restart = VLC_TRUE; + +#define change_autosave() \ + p_config[i_config].b_autosave = VLC_TRUE; + +#define change_unsaveable() \ + p_config[i_config].b_unsaveable = VLC_TRUE; + +/**************************************************************************** + * config_chain_t: + ****************************************************************************/ +struct config_chain_t +{ + config_chain_t *p_next; + + char *psz_name; + char *psz_value; +}; + +#define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d ) +VLC_EXPORT( void, __config_ChainParse, ( vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t * ) ); +VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, const char * ) ); +VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) ); + +static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, const char *psz_name ) +{ + while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) ) + { + p_cfg = p_cfg->p_next; + } + + return p_cfg; +} + +static inline char *config_chain_find_value( config_chain_t *p_cfg, const char *psz_name ) +{ + while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) ) + { + p_cfg = p_cfg->p_next; + } + + if( p_cfg && p_cfg->psz_value ) + { + return( p_cfg->psz_value ); + } + + return NULL; +}