X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfiguration.h;h=92bc61f328ae71a61b0929fc82c4d261cb6597d5;hb=5ca3fb1cd427871afb2f0ec3f02dc15914405fac;hp=66c2bf2944e78c71da4d93a3830cf3b7cceeb778;hpb=8fb0525e7ba1467fc65236e0bae9e7032acd7be8;p=vlc diff --git a/include/configuration.h b/include/configuration.h index 66c2bf2944..92bc61f328 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -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 */ @@ -45,9 +51,70 @@ #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 */ @@ -79,6 +146,9 @@ struct module_config_t 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 */ @@ -88,6 +158,12 @@ struct module_config_t 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 */ }; /***************************************************************************** @@ -132,6 +208,7 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); /* internal only */ int config_CreateDir( vlc_object_t *, char * ); +int config_AutoSaveConfigFile( vlc_object_t * ); /***************************************************************************** * Macros used to build the configuration structure. @@ -146,16 +223,37 @@ int config_CreateDir( vlc_object_t *, char * ); * allow for a more user friendly interface. *****************************************************************************/ -#define add_category_hint( text, longtext, advc ) \ +#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_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_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 ) \ + 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 \ i_config++; \ if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \ @@ -167,6 +265,7 @@ int config_CreateDir( vlc_object_t *, char * ); (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, \ @@ -182,42 +281,79 @@ int config_CreateDir( vlc_object_t *, char * ); 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; @@ -254,3 +390,6 @@ int config_CreateDir( vlc_object_t *, char * ); 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;