From 68bbab0e42e141896545f1f6e9699bcad2d685f8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 22 May 2015 18:35:03 +0200 Subject: audio: change range of volume option/property Now --volume takes an absolute volume, meaning it doesn't depend on --softvol-max. 0 is still silence, and 100 now always means unchanged volume. The OSD and the "volume" property are changed accordingly. Also raise the minimum value of --softvol-max. A value below 100 makes no sense and breaks the OSD. --- DOCS/man/input.rst | 2 +- DOCS/man/options.rst | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 4ae7ae9da6..d264b2703d 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1132,7 +1132,7 @@ Property list See ``--hr-seek``. ``volume`` (RW) - Current volume (0-100). + Current volume (see ``--volume`` for details). ``mute`` (RW) Current mute status (``yes``/``no``). diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 2718a89606..a0b59059b6 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -882,9 +882,15 @@ Audio ``--ad=help`` List all available decoders. -``--volume=<-1-100>`` - Set the startup volume. A value of -1 (the default) will not change the - volume. See also ``--softvol``. +``--volume=`` + Set the startup volume. 0 means silence, 100 means no volume reduction or + amplification. A value of -1 (the default) will not change the volume. See + also ``--softvol``. + + .. note:: + + This was changed after the mpv 0.9 release. Before that, 100 actually + meant maximum volume. ``--audio-delay=`` Audio delay in seconds (positive or negative float value). Positive values @@ -1053,19 +1059,10 @@ Audio their start timestamps differ, and then video timing is gradually adjusted if necessary to reach correct synchronization later. -``--softvol-max=<10.0-10000.0>`` +``--softvol-max=<100.0-10000.0>`` Set the maximum amplification level in percent (default: 200). A value of 200 will allow you to adjust the volume up to a maximum of double the - current level. With values below 100 the initial volume (which is 100%) - will be above the maximum, which e.g. the OSD cannot display correctly. - - .. admonition:: Note - - The maximum value of ``--volume`` as well as the ``volume`` property - is always 100. Likewise, the volume OSD bar always goes from 0 to 100. - This means that with ``--softvol-max=200``, ``--volume=100`` sets - maximum amplification, i.e. amplify by 200%. The default volume (no - change in volume) will be ``50`` in this case. + current level. ``--audio-file-auto=``, ``--no-audio-file-auto`` Load additional audio files matching the video filename. The parameter -- cgit v1.2.3