From 7fe56f16026d6b2440e879078f8848a5056f1da8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 18 Sep 2012 15:50:24 +0200 Subject: options: accept "yes" and "no" only for flags This removes the alternative values like "off", "0", "false" etc., and also the non-English versions of these. This is done for general consistency. It's better to have a single way of doing things when multiple ways don't add singificant value. Also update some choices for consistency. --- cfg-mplayer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cfg-mplayer.h') diff --git a/cfg-mplayer.h b/cfg-mplayer.h index a6b8e93647..775963a879 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -333,7 +333,7 @@ const m_option_t common_opts[] = { {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif OPT_CHOICE("no-config", noconfig, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE, - ({"off", 0}, {"user", 1}, {"system", 2}, {"all", 3})), + ({"no", 0}, {"user", 1}, {"system", 2}, {"all", 3})), // ------------------------- stream options -------------------- @@ -695,7 +695,7 @@ const m_option_t mplayer_opts[]={ OPT_FLAG_CONSTANTS("no-loop", loop_times, 0, 0, -1), OPT_CHOICE_OR_INT("loop", loop_times, 0, 1, 10000, - ({"off", -1}, {"0", -1}, + ({"no", -1}, {"0", -1}, {"inf", 0})), {"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN, 1, 0, NULL}, @@ -712,7 +712,7 @@ const m_option_t mplayer_opts[]={ ({"auto", 0}, {"decoder", 1}, {"sort", 2})), OPT_MAKE_FLAGS("initial-audio-sync", initial_audio_sync, 0), OPT_CHOICE("hr-seek", hr_seek, 0, - ({"off", -1}, {"absolute", 0}, {"always", 1}, {"on", 1})), + ({"no", -1}, {"absolute", 0}, {"always", 1}, {"yes", 1})), OPT_FLOATRANGE("hr-seek-demuxer-offset", hr_seek_demuxer_offset, 0, -9, 99), OPT_FLAG_CONSTANTS("no-autosync", autosync, 0, 0, -1), OPT_INTRANGE("autosync", autosync, 0, 0, 10000), @@ -722,7 +722,7 @@ const m_option_t mplayer_opts[]={ OPT_CHOICE("term-osd", term_osd, 0, ({"force", 1}, {"auto", 2}, {"", 2}, - {"off", 0})), + {"no", 0})), OPT_STRING("term-osd-esc", term_osd_esc, 0, OPTDEF_STR("\x1b[A\r\x1b[K")), OPT_STRING("playing-msg", playing_msg, 0), -- cgit v1.2.3