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.
This commit is contained in:
wm4 2016-11-19 01:17:12 +01:00
parent 5a011c5c06
commit bb48f09532
2 changed files with 5 additions and 4 deletions

View File

@ -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.

View File

@ -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),