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.

3 files changed, 14 insertions, 19 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
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index eeac7fada9..26c9e9d9d2 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -131,6 +131,8 @@ Command Line Switches
     ``-lavfdopts``              ``--demuxer-lavf-...``
     ``-rawaudio ...``           ``--demuxer-rawaudio-...``
     ``-rawvideo ...``           ``--demuxer-rawvideo-...``
+    ``--mixer``                 AO suboptions (``alsa``, ``oss``)
+    ``--mixer-channel``         AO suboptions (``alsa``, ``oss``)
     =========================== ========================================
 
 .. note::
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index bb908f3885..394cc720f4 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1202,24 +1202,6 @@
     :fps=<value>:  output fps (default: 25)
     :type=<value>: input file type (available: jpeg, png, tga, sgi)
 
-``--mixer=<device>``
-    Use a mixer device different from the default ``/dev/mixer``. For ALSA
-    this is the mixer name.
-
-``--mixer-channel=<name[,index]>``
-    (``--ao=oss`` and ``--ao=alsa`` only)
-    This option will tell mpv to use a different channel for controlling
-    volume than the default PCM. Options for OSS include **vol, pcm, line**.
-    For a complete list of options look for ``SOUND_DEVICE_NAMES`` in
-    ``/usr/include/linux/soundcard.h``. For ALSA, you can use the names e.g.
-    "``amixer scontrols``" displays, like **Master, Line, PCM**.
-
-    .. note::
-
-        ALSA mixer channel names followed by a number must be specified in the
-        <name,number> format, i.e. a channel labeled 'PCM 1' in alsamixer must
-        be converted to PCM,1.
-
 ``--monitoraspect=<ratio>``
     Set the aspect ratio of your monitor or TV screen. A value of 0 disables a
     previous setting (e.g. in the config file). Overrides the