X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfiguration.h;h=76e61ad4abe44f36a1abfd4119cce6c275fa2d7c;hb=5ebed5dccb12b70f47345fa5ebe70830ed075f7a;hp=43a079bff9889242a3cfac754a12e132fa075d04;hpb=1f327d873229279968801eacfa15265278fd0550;p=vlc diff --git a/include/configuration.h b/include/configuration.h index 43a079bff9..76e61ad4ab 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -4,7 +4,7 @@ * It includes functions allowing to declare, get or set configuration options. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: configuration.h,v 1.18 2002/07/31 22:54:21 sam Exp $ + * $Id: configuration.h,v 1.27 2003/05/12 17:33:19 gbazin Exp $ * * Authors: Gildas Bazin * @@ -43,6 +43,7 @@ #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 0x00F0 @@ -57,6 +58,10 @@ struct module_config_t 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 */ /* Function to call when commiting a change */ void ( * pf_callback ) ( vlc_object_t * ); @@ -65,6 +70,12 @@ struct module_config_t 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; }; /***************************************************************************** @@ -82,6 +93,8 @@ 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( void, __config_ResetAll, ( vlc_object_t * ) ); + VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char *psz_name ) ); VLC_EXPORT( void, config_Duplicate, ( module_t *, module_config_t * ) ); @@ -100,6 +113,7 @@ 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)) /***************************************************************************** * Macros used to build the configuration structure. @@ -114,43 +128,49 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); * allow for a more user friendly interface. *****************************************************************************/ -#define add_category_hint( text, longtext ) \ - { module_config_t tmp = { CONFIG_HINT_CATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++ +#define add_category_hint( text, longtext, advc ) \ + { 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; } i_config++ #define add_subcategory_hint( text, longtext ) \ - { module_config_t tmp = { CONFIG_HINT_SUBCATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++ + { static module_config_t tmp = { CONFIG_HINT_SUBCATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++ #define end_subcategory_hint \ - { module_config_t tmp = { CONFIG_HINT_SUBCATEGORY_END, NULL, NULL, '\0' }; p_config[ i_config ] = tmp; } i_config++ + { static module_config_t tmp = { CONFIG_HINT_SUBCATEGORY_END, NULL, NULL, '\0' }; p_config[ i_config ] = tmp; } i_config++ #define add_usage_hint( text ) \ - { module_config_t tmp = { CONFIG_HINT_USAGE, NULL, NULL, '\0', text }; p_config[ i_config ] = tmp; } i_config++ + { 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 ) \ - { module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ +#define add_string( name, psz_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ #define add_string_from_list( name, psz_value, ppsz_list, p_callback, text, \ - longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, p_callback, ppsz_list }; p_config[ i_config ] = tmp; } i_config++ -#define add_file( name, psz_value, p_callback, text, longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, '\0', text, longtext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_module( name, psz_caps, psz_value, p_callback, text, longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, '\0', text, longtext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_integer( name, i_value, p_callback, text, longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_float( name, f_value, p_callback, text, longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_bool( name, b_value, p_callback, text, longtext ) \ - { module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, '\0', text, longtext, NULL, b_value, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ + longtext, advc ) \ + { 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; p_config[i_config].b_advanced = advc; } i_config++ +#define add_file( name, psz_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_directory( name, psz_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_module( name, psz_caps, psz_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_integer( name, i_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_integer_with_range( name, i_value, i_min, i_max, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_float( name, f_value, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_float_with_range( name, f_value, f_min, f_max, p_callback, text, longtext, advc ) \ + { 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; } i_config++ +#define add_bool( name, b_value, p_callback, text, longtext, advc ) \ + { 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; } 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 ) \ - { module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, ch, text, ltext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_file_with_short( name, ch, psz_value, p_callback, text, ltext ) \ - { module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, ch, text, ltext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ +#define add_string_with_short( name, ch, psz_value, p_callback, text, ltext, advc ) \ + { 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; p_config[i_config].b_advanced = advc; } i_config++ +#define add_file_with_short( name, ch, psz_value, p_callback, text, ltext, advc ) \ + { 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; p_config[i_config].b_advanced = advc; } i_config++ #define add_module_with_short( name, ch, psz_caps, psz_value, p_callback, \ - text, ltext) \ - { module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, ch, text, ltext, psz_value, 0, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_integer_with_short( name, ch, i_value, p_callback, text, ltext ) \ - { module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, ch, text, ltext, NULL, i_value, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_float_with_short( name, ch, f_value, p_callback, text, ltext ) \ - { module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, ch, text, ltext, NULL, 0, f_value, p_callback }; p_config[ i_config ] = tmp; } i_config++ -#define add_bool_with_short( name, ch, b_value, p_callback, text, ltext ) \ - { module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, ch, text, ltext, NULL, b_value, 0, p_callback }; p_config[ i_config ] = tmp; } i_config++ + text, ltext, advc) \ + { 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; p_config[i_config].b_advanced = advc; } i_config++ +#define add_integer_with_short( name, ch, i_value, p_callback, text, ltext, advc ) \ + { 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; p_config[i_config].b_advanced = advc; } i_config++ +#define add_float_with_short( name, ch, f_value, p_callback, text, ltext, advc ) \ + { 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; p_config[i_config].b_advanced = advc;} i_config++ +#define add_bool_with_short( name, ch, b_value, p_callback, text, ltext, advc ) \ + { 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; p_config[i_config].b_advanced = advc;} i_config++