From 79e20ff485db4ee82e7b475a5329bf303570cde6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 18 Sep 2016 11:58:24 +0200 Subject: options: actually deprecate --mute=auto Also, make it internally actually an alias to "no". --- DOCS/interface-changes.rst | 1 + DOCS/man/input.rst | 3 +++ DOCS/man/options.rst | 7 ++++--- options/options.c | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 6774170aee..a5c141d953 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -72,6 +72,7 @@ Interface changes treating it as a hardware overlay (without applying GL filtering). Also to be changed in 0.22.0: the --fs flag will be reset to "no" by default (like on the other platforms). + - deprecate --mute=auto (informally has been since 0.18.1) - deprecate "resume" and "suspend" IPC commands. They will be completely removed in 0.22.0. - deprecate mp.suspend(), mp.resume(), mp.resume_all() Lua scripting diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index f127882bb3..c7c7c0d887 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -2114,6 +2114,9 @@ caveats with some properties (due to historical reasons): When set as option, the maximum (set by ``--volume-max``) is not checked, while when set as property, the maximum is enforced. +``mute`` + The option has a deprecated ``auto`` value, which is equal to ``no``. + ``playlist`` The property is read-only and returns the current internal playlist. The option is for loading playlist during command line parsing. For client API diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 6d390ebb7d..cefd12eae5 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -1134,9 +1134,10 @@ Audio Audio delay in seconds (positive or negative float value). Positive values delay the audio, and negative values delay the video. -``--mute=`` - Set startup audio mute status. ``auto`` (default) will not change the mute - status. +``--mute=`` + Set startup audio mute status (default: no). + + ``auto`` is a deprecated possible value that is equivalent to ``no``. See also: ``--volume``. diff --git a/options/options.c b/options/options.c index f2e7c863e2..29fd14e7f5 100644 --- a/options/options.c +++ b/options/options.c @@ -514,8 +514,8 @@ const m_option_t mp_opts[] = { // values <0 for volume and mute are legacy and ignored OPT_FLOATRANGE("volume", softvol_volume, 0, -1, 1000), OPT_CHOICE("mute", softvol_mute, 0, - ({"auto", -1}, - {"no", 0}, + ({"no", 0}, + {"auto", 0}, {"yes", 1})), OPT_CHOICE("gapless-audio", gapless_audio, 0, ({"no", 0}, -- cgit v1.2.3