summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-15 22:39:33 +0200
committerwm4 <wm4@nowhere>2013-08-15 23:46:18 +0200
commit34785754198d7898c12f3b9aa4bec051e90b967d (patch)
treed1e753c6bf8043745263e65fa9d5f59eef921f9f
parent88a53309cd22fb183d46e4fc01a58914b8a1b395 (diff)
downloadmpv-34785754198d7898c12f3b9aa4bec051e90b967d.tar.bz2
mpv-34785754198d7898c12f3b9aa4bec051e90b967d.tar.xz
manpage: fix incorrect ao_alsa example, extend changes.rst
One example in ao.rst used the old syntax with mangled device names. Fix it. Mention some shell related caveats. Explicitly mention the change of device name syntax in changes.rst, because it seems to be a common issue.
-rw-r--r--DOCS/man/en/ao.rst8
-rw-r--r--DOCS/man/en/changes.rst1
2 files changed, 7 insertions, 2 deletions
diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst
index 2ced3ba170..d8b7cc011a 100644
--- a/DOCS/man/en/ao.rst
+++ b/DOCS/man/en/ao.rst
@@ -17,8 +17,8 @@ in the list. Suboptions are optional and can mostly be omitted.
.. admonition:: Examples
- ``--ao=alsa,oss,`` Try the ALSA driver, then the OSS driver, then others.
- - ``--ao=alsa:noblock:device=hw=0.3`` Sets noblock-mode and the device-name
- as first card, fourth device.
+ - ``--ao=alsa:noblock:device=[hw:0,3]`` Sets noblock-mode and the
+ device-name as first card, fourth device.
Available audio output drivers are:
@@ -48,6 +48,10 @@ Available audio output drivers are:
``--ao=alsa:device=[plug:surround50]``
+ Note that the ``[`` and ``]`` simply quote the device name. With some
+ shells (like zsh), you have to quote the option string to prevent the
+ shell from interpreting the brackets instead of passing them to mpv.
+
``oss``
OSS audio output driver
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 395f183bc2..21410f2c8d 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -141,6 +141,7 @@ Command Line Switches
``-rawvideo ...`` ``--demuxer-rawvideo-...``
``--mixer`` AO suboptions (``alsa``, ``oss``)
``--mixer-channel`` AO suboptions (``alsa``, ``oss``)
+ ``--ao=alsa:device=hw=0.3`` ``--ao=alsa:device=[hw:0,3]``
=========================== ========================================
.. note::