path: root/input
diff options
authorUoti Urpala <>2012-05-17 03:31:11 +0300
committerUoti Urpala <>2012-07-16 21:08:42 +0300
commitdc2a4863af9b0e587ac4ec3e2096639098e99a8f (patch)
tree15807fb5de256f91f730c435ab614332f12fa255 /input
parentf63dbaddb6de6add6d987dc28ca8771aca230451 (diff)
options: support parsing values into substructs
Add an alternate mode for option parser objects (struct m_config) which is not inherently tied to any particular instance of an option value struct. Instead, this type or parsers can be used to initialize defaults in or parse values into a struct given as a parameter. They do not have the save slot functionality used for main player configuration. The new functionality will be used to replace the separate subopt_helper.c parsing code that is currently used to parse per-object suboptions in VOs etc. Previously, option default values were handled by initializing them in external code before creating a parser. This initialization was done with constants even for dynamically-allocated types like strings. Because trying to free a pointer to a constant would cause a crash when trying to replace the default with another value, parser initialization code then replaced all the original defaults with dynamically-allocated copies. This replace-with-copy behavior is no longer supported for new-style options; instead the option definition itself may contain a default value (new OPTDEF macros), and the new function m_config_initialize() is used to set all options to their default values. Convert the existing initialized dynamically allocated options in main config (the string options --dumpfile, --term-osd-esc, --input=conf) to use this. Other non-dynamic ones could be later converted to use this style of initialization too. There's currently no public call to free all dynamically allocated options in a given option struct because I intend to use talloc functionality for that (make them children of the struct and free with it).
Diffstat (limited to 'input')
1 files changed, 1 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index a6da6f324c..af78314153 100644
--- a/input/input.c
+++ b/input/input.c
@@ -638,7 +638,7 @@ static int print_cmd_list(m_option_t *cfg, char *optname, char *optparam);
// Our command line options
static const m_option_t input_conf[] = {
- OPT_STRING("conf", input.config_file, CONF_GLOBAL),
+ OPT_STRING("conf", input.config_file, CONF_GLOBAL, OPTDEF_STR("input.conf")),
OPT_INT("ar-delay", input.ar_delay, CONF_GLOBAL),
OPT_INT("ar-rate", input.ar_rate, CONF_GLOBAL),
{ "keylist", print_key_list, CONF_TYPE_PRINT_FUNC, CONF_NOCFG },