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/options.rst | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'DOCS/man/en/options.rst') 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=: output fps (default: 25) :type=: input file type (available: jpeg, png, tga, sgi) -``--mixer=`` - Use a mixer device different from the default ``/dev/mixer``. For ALSA - this is the mixer name. - -``--mixer-channel=`` - (``--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 - format, i.e. a channel labeled 'PCM 1' in alsamixer must - be converted to PCM,1. - ``--monitoraspect=`` 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 -- cgit v1.2.3