summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-11-19 01:17:12 +0100
committerwm4 <wm4@nowhere>2016-11-19 01:19:14 +0100
commitbb48f095320da6e0a71bc18729b8324924dd9bdb (patch)
tree879e0d8fdb1ccd79843f3e64563699abdc0307f9
parent5a011c5c06d3a3263cd0d97d2b7c8f9bf2d1f816 (diff)
downloadmpv-bb48f095320da6e0a71bc18729b8324924dd9bdb.tar.bz2
mpv-bb48f095320da6e0a71bc18729b8324924dd9bdb.tar.xz
options: clarify --softvol deprecation message and manpage entry
People seem to think that the softvol behavior is deprecated, but what is deprecated is actually disabling softvol.
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--options/options.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 20744a0323..bf98370eee 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1175,9 +1175,9 @@ Audio
to use the volume controls of the audio output driver or the internal mpv
volume filter.
- The current behavior is as if this option was set to ``yes``. The other
- behaviors are not available anymore, although ``auto`` almost matches
- current behavior in most cases.
+ The current behavior is that softvol is always enabled, i.e. as if this
+ option is set to ``yes``. The other behaviors are not available anymore,
+ although ``auto`` almost matches current behavior in most cases.
The ``no`` behavior is still partially available through the ``ao-volume``
and ``ao-mute`` properties. But there are no options to reset these.
diff --git a/options/options.c b/options/options.c
index e4c682303b..442c29297a 100644
--- a/options/options.c
+++ b/options/options.c
@@ -525,7 +525,8 @@ const m_option_t mp_opts[] = {
({"no", SOFTVOL_NO},
{"yes", SOFTVOL_YES},
{"auto", SOFTVOL_AUTO}),
- .deprecation_message = "no replacement"),
+ .deprecation_message = "softvol is always active, and behaves "
+ "as if --softvol=yes is always set"),
OPT_FLOATRANGE("volume-max", softvol_max, 0, 100, 1000),
// values <0 for volume and mute are legacy and ignored
OPT_FLOATRANGE("volume", softvol_volume, 0, -1, 1000),