From 5b91ba0a8dd052d5d52309e439398f693d390b1b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 21 Jul 2013 23:27:09 +0200 Subject: 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. --- DOCS/man/en/ao.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'DOCS/man/en/ao.rst') 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=`` 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=`` + Set the mixer device used with ``--no-softvol`` (default: ``default``). + ``mixer-name=`` + Set the name of the mixer element (default: ``Master``). This is for + example ``PCM`` or ``Master``. + ``mixer-index=`` + 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: ```` Sets the audio mixer device (default: ``/dev/mixer``). ```` - 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 -- cgit v1.2.3