X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfiguration.h;h=92bc61f328ae71a61b0929fc82c4d261cb6597d5;hb=91b15ce6b40f5b452dc297b03e1fee4b5004c769;hp=16e79169478b28efc3f365b1142e6eca03acb8d2;hpb=7f00f3bf4aff9ac5ccaa122c82cc747b2adf3cce;p=vlc diff --git a/include/configuration.h b/include/configuration.h index 16e7916947..92bc61f328 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -4,15 +4,15 @@ * It includes functions allowing to declare, get or set configuration options. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: configuration.h,v 1.23 2003/01/06 00:37:29 garf Exp $ + * $Id$ * - * Authors: Gildas Bazin + * Authors: Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -28,12 +28,18 @@ *****************************************************************************/ /* 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 */ #define CONFIG_HINT_USAGE 0x0005 /* Usage information */ +#define CONFIG_CATEGORY 0x0006 /* Set category */ +#define CONFIG_SUBCATEGORY 0x0007 /* Set subcategory */ +#define CONFIG_SECTION 0x0008 /* Start of new section */ + #define CONFIG_HINT 0x000F /* Configuration item types */ @@ -43,9 +49,72 @@ #define CONFIG_ITEM_INTEGER 0x0040 /* Integer option */ #define CONFIG_ITEM_BOOL 0x0050 /* Bool option */ #define CONFIG_ITEM_FLOAT 0x0060 /* Float option */ +#define CONFIG_ITEM_DIRECTORY 0x0070 /* Directory option */ +#define CONFIG_ITEM_KEY 0x0080 /* Hot key option */ +#define CONFIG_ITEM_MODULE_CAT 0x0090 /* Module option */ +#define CONFIG_ITEM_MODULE_LIST 0x00A0 /* Module option */ +#define CONFIG_ITEM_MODULE_LIST_CAT 0x00B0 /* Module option */ #define CONFIG_ITEM 0x00F0 +/******************************************************************* + * 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 CAT_AUDIO 2 + #define SUBCAT_AUDIO_GENERAL 201 + #define SUBCAT_AUDIO_AOUT 202 + #define SUBCAT_AUDIO_AFILTER 203 + #define SUBCAT_AUDIO_VISUAL 204 + #define SUBCAT_AUDIO_MISC 205 + +#define CAT_VIDEO 3 + #define SUBCAT_VIDEO_GENERAL 301 + #define SUBCAT_VIDEO_VOUT 302 + #define SUBCAT_VIDEO_VFILTER 303 + #define SUBCAT_VIDEO_TEXT 304 + #define SUBCAT_VIDEO_SUBPIC 305 + +#define CAT_INPUT 4 + #define SUBCAT_INPUT_ACCESS 401 + #define SUBCAT_INPUT_ACCESS_FILTER 402 + #define SUBCAT_INPUT_DEMUX 403 + #define SUBCAT_INPUT_VCODEC 404 + #define SUBCAT_INPUT_ACODEC 405 + #define SUBCAT_INPUT_SCODEC 406 + #define SUBCAT_INPUT_ADVANCED 407 + +#define CAT_SOUT 5 + #define SUBCAT_SOUT_GENERAL 501 + #define SUBCAT_SOUT_STREAM 502 + #define SUBCAT_SOUT_MUX 503 + #define SUBCAT_SOUT_ACO 504 + #define SUBCAT_SOUT_PACKETIZER 505 + #define SUBCAT_SOUT_SAP 506 + #define SUBCAT_SOUT_VOD 507 + +#define CAT_ADVANCED 6 + #define SUBCAT_ADVANCED_CPU 601 + #define SUBCAT_ADVANCED_MISC 602 + #define SUBCAT_ADVANCED_NETWORK 603 + #define SUBCAT_ADVANCED_XML 604 + +#define CAT_PLAYLIST 7 + #define SUBCAT_PLAYLIST_GENERAL 701 + #define SUBCAT_PLAYLIST_SD 702 + #define SUBCAT_PLAYLIST_EXPORT 703 + +struct config_category_t +{ + int i_id; + char *psz_name; + char *psz_help; +}; + struct module_config_t { int i_type; /* Configuration type */ @@ -63,19 +132,45 @@ struct module_config_t float f_max; /* Option maximum value */ /* Function to call when commiting a change */ - void ( * pf_callback ) ( vlc_object_t * ); + vlc_callback_t pf_callback; + void *p_callback_data; + /* Values list */ 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 */ + 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 */ + int i_action; /* actions list size */ + /* Deprecated */ + char *psz_current; /* Good option name */ + vlc_bool_t b_strict; /* Transitionnal or strict */ + /* 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 */ + /* Original option values */ + char *psz_value_orig; + int i_value_orig; + float f_value_orig; + + /* Option values loaded from config file */ + char *psz_value_saved; + int i_value_saved; + float f_value_saved; + vlc_bool_t b_autosave; /* Config will be auto-saved at exit time */ }; /***************************************************************************** * Prototypes - these methods are used to get, set or manipulate configuration * data. *****************************************************************************/ +VLC_EXPORT( int, __config_GetType, (vlc_object_t *, const char *) ); VLC_EXPORT( int, __config_GetInt, (vlc_object_t *, const char *) ); VLC_EXPORT( void, __config_PutInt, (vlc_object_t *, const char *, int) ); VLC_EXPORT( float, __config_GetFloat, (vlc_object_t *, const char *) ); @@ -87,7 +182,10 @@ VLC_EXPORT( int, __config_LoadCmdLine, ( vlc_object_t *, int *, char *[], vl VLC_EXPORT( char *, config_GetHomeDir, ( void ) ); VLC_EXPORT( int, __config_LoadConfigFile, ( vlc_object_t *, const char * ) ); VLC_EXPORT( int, __config_SaveConfigFile, ( vlc_object_t *, const char * ) ); -VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char *psz_name ) ); +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 * ) ); void config_Free ( module_t * ); @@ -95,6 +193,7 @@ VLC_EXPORT( void, config_Duplicate, ( module_t *, module_config_t * ) ); VLC_EXPORT( void, config_SetCallbacks, ( module_config_t *, module_config_t * ) ); VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); +#define config_GetType(a,b) __config_GetType(VLC_OBJECT(a),b) #define config_GetInt(a,b) __config_GetInt(VLC_OBJECT(a),b) #define config_PutInt(a,b,c) __config_PutInt(VLC_OBJECT(a),b,c) #define config_GetFloat(a,b) __config_GetFloat(VLC_OBJECT(a),b) @@ -105,6 +204,11 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); #define config_LoadCmdLine(a,b,c,d) __config_LoadCmdLine(VLC_OBJECT(a),b,c,d) #define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b) #define config_SaveConfigFile(a,b) __config_SaveConfigFile(VLC_OBJECT(a),b) +#define config_ResetAll(a) __config_ResetAll(VLC_OBJECT(a)) + +/* internal only */ +int config_CreateDir( vlc_object_t *, char * ); +int config_AutoSaveConfigFile( vlc_object_t * ); /***************************************************************************** * Macros used to build the configuration structure. @@ -119,47 +223,173 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); * allow for a more user friendly interface. *****************************************************************************/ -#define add_category_hint( text, longtext ) \ - { static module_config_t tmp = { CONFIG_HINT_CATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++ +#define set_category( 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_CATEGORY, NULL, NULL , '\0', NULL, NULL, NULL, i_id }; p_config[ i_config ] = tmp; } + +#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; } + +#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 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; } + #define add_subcategory_hint( text, longtext ) \ - { static module_config_t tmp = { CONFIG_HINT_SUBCATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++ + 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; } + + #define end_subcategory_hint \ - { static module_config_t tmp = { CONFIG_HINT_SUBCATEGORY_END, NULL, NULL, '\0' }; p_config[ i_config ] = tmp; } i_config++ + 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; } #define add_usage_hint( text ) \ - { static module_config_t tmp = { CONFIG_HINT_USAGE, NULL, NULL, '\0', text }; p_config[ i_config ] = tmp; } i_config++ - -#define add_string( name, psz_value, p_callback, text, longtext ) \ - { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_string_from_list( name, psz_value, ppsz_list, p_callback, text, \ - longtext ) \ - { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, 0, 0, 0, 0, NULL, ppsz_list }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_file( name, psz_value, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_module( name, psz_caps, psz_value, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_integer( name, i_value, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_integer_with_range( name, i_value, i_min, i_max, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_float( name, f_value, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_float_with_range( name, f_value, f_min, f_max, p_callback, text, longtext ) \ - { 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; } i_config++ -#define add_bool( name, b_value, p_callback, text, longtext ) \ - { 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; } i_config++ - -/* These should be seldom used. They were added just to provide easy shortcuts - * for the command line interface */ -#define add_string_with_short( name, ch, psz_value, p_callback, text, ltext ) \ - { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_file_with_short( name, ch, psz_value, p_callback, text, ltext ) \ - { static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_module_with_short( name, ch, psz_caps, psz_value, p_callback, \ - text, ltext) \ - { static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_integer_with_short( name, ch, i_value, p_callback, text, ltext ) \ - { static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, ch, text, ltext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_float_with_short( name, ch, f_value, p_callback, text, ltext ) \ - { static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, ch, text, ltext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ -#define add_bool_with_short( name, ch, b_value, p_callback, text, ltext ) \ - { static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, ch, text, ltext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++ + 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; } + + +#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_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_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_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_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_deprecated( name, strict ) \ + 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={}; \ + p_config[ i_config ] = tmp; \ + 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; } + +/* Modifier macros for the config options (used for fine tuning) */ +#define change_short( ch ) \ + p_config[i_config].i_short = ch; + +#define change_string_list( list, list_text, list_update_func ) \ + p_config[i_config].i_list = sizeof(list)/sizeof(char *); \ + p_config[i_config].ppsz_list = list; \ + p_config[i_config].ppsz_list_text = list_text; + +#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].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_float_range( min, max ) \ + p_config[i_config].f_min = min; \ + p_config[i_config].f_max = max; + +#define change_action_add( pf_action, action_text ) \ + if( !p_config[i_config].i_action ) \ + { p_config[i_config].ppsz_action_text = 0; \ + p_config[i_config].ppf_action = 0; } \ + 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 **)\ + 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_autosave() \ + p_config[i_config].b_autosave = VLC_TRUE;