diff options
| author | wm4 <wm4@nowhere> | 2013-07-21 23:27:09 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-21 23:35:14 +0200 |
| commit | 5b91ba0a8dd052d5d52309e439398f693d390b1b (patch) | |
| tree | 7e808ef5420e188fdf736261f7a6ed17c0ec174a /DOCS/man/en/ao.rst | |
| parent | 5c610836cd0a301944d018f2020e0304e8b186fa (diff) | |
| download | mpv-5b91ba0a8dd052d5d52309e439398f693d390b1b.tar.bz2 mpv-5b91ba0a8dd052d5d52309e439398f693d390b1b.tar.xz | |
options: remove --mixer and --mixer-channel, turn them into alsa/oss subopts
These two options were supported by ALSA and OSS only. Further, their
values were specific to the respective audio systems, so it doesn't make
sense to keep them as top-level options.
Diffstat (limited to 'DOCS/man/en/ao.rst')
| -rw-r--r-- | DOCS/man/en/ao.rst | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst index 82f77c6e6d..0d7720c4ee 100644 --- a/DOCS/man/en/ao.rst +++ b/DOCS/man/en/ao.rst @@ -30,6 +30,15 @@ Available audio output drivers are: ``device=<device>`` Sets the device name. For ac3 output via S/PDIF, use an "iec958" or "spdif" device, unless you really know how to set it correctly. + ``mixer-device=<device>`` + Set the mixer device used with ``--no-softvol`` (default: ``default``). + ``mixer-name=<name>`` + Set the name of the mixer element (default: ``Master``). This is for + example ``PCM`` or ``Master``. + ``mixer-index=<number>`` + Set the index of the mixer channel (default: 0). Consider the output + "``amixer scontrols``", then the index is the number that follows the + name of the element. .. note:: @@ -47,7 +56,9 @@ Available audio output drivers are: ``<mixer-device>`` Sets the audio mixer device (default: ``/dev/mixer``). ``<mixer-channel>`` - Sets the audio mixer channel (default: ``pcm``). + Sets the audio mixer channel (default: ``pcm``). Other valid values + include **vol, pcm, line**. For a complete list of options look for + ``SOUND_DEVICE_NAMES`` in ``/usr/include/linux/soundcard.h``. ``jack`` JACK (Jack Audio Connection Kit) audio output driver |