summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-20 13:48:36 +0200
committerwm4 <wm4@nowhere>2013-09-20 13:48:36 +0200
commit3e5b632559a9198c0ede739622529d8df7909ca7 (patch)
tree0b66c871c6b670313da1dcedb9582db2a856cf51 /DOCS
parented2d67b6d7585a5db5411f230fc8dcd27f9e85fc (diff)
parent542086dd4537b852b61974f9bee4eabebde8505f (diff)
downloadmpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.bz2
mpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.xz
Merge branch 'volume_restore'
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/af.rst2
-rw-r--r--DOCS/man/en/changes.rst1
-rw-r--r--DOCS/man/en/options.rst12
3 files changed, 14 insertions, 1 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index a6ad32989c..8844077781 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -438,7 +438,7 @@ Available filters are:
``drc[=method:target]``
Applies dynamic range compression. This maximizes the volume by compressing
- the audio signal's dynamic range.
+ the audio signal's dynamic range. (Formerly called ``volnorm``.)
``<method>``
Sets the used method.
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 8996a90336..489fadd36c 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -172,6 +172,7 @@ Command Line Switches
``--mixer`` AO suboptions (``alsa``, ``oss``)
``--mixer-channel`` AO suboptions (``alsa``, ``oss``)
``--ao=alsa:device=hw=0.3`` ``--ao=alsa:device=[hw:0,3]``
+ ``-af volnorm`` ``--af=drc`` (renamed)
=========================== ========================================
.. note::
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 1c07403ea7..766118e4c6 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2589,6 +2589,18 @@
Set the startup volume. A value of -1 (the default) will not change the
volume. See also ``--softvol``.
+``--volume-restore-data=<string>``
+ Used internally for use by playback resume (e.g. with ``quit_watch_later``).
+ Restoring value has to be done carefully, because different AOs as well as
+ softvol can have different value ranges, and we don't want to restore
+ volume if setting the volume changes it system wide. The normal options
+ (like ``--volume``) would always set the volume. This option was added for
+ restoring volume in a safer way (by storing the method used to set the
+ volume), and is not generally useful. Its semantics are considered private
+ to mpv.
+
+ Do not use.
+
``--wid=<ID>``
(X11 and Windows only)
This tells mpv to attach to an existing window. The ID is interpreted as