summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-02 13:10:58 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-02 13:10:58 +0000
commit528b80868c2fdb0987fdcf5fec89c3d648701058 (patch)
treece54256f7f4407ab93ccb7e776bd1a05fd2bd621 /DOCS
parent319dfbad80c416ae4a3a5d7bd17694da5e3e5771 (diff)
downloadmpv-528b80868c2fdb0987fdcf5fec89c3d648701058.tar.bz2
mpv-528b80868c2fdb0987fdcf5fec89c3d648701058.tar.xz
ao_alsa now uses -mixer-channel instead of its special -mixer syntax
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12749 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.17
1 files changed, 5 insertions, 2 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 5c7d14618d..30f2f8b5c5 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1536,14 +1536,17 @@ Signed 32-bit (Big-Endian)
.B \-mixer <device>
This option will tell MPlayer to use a different device for mixing than
/dev/\:mixer.
+For ALSA this is the mixer name.
.TP
-.B \-mixer-channel <mixer line> (\-ao oss only)
+.B \-mixer-channel <mixer line> (\-ao oss and \-ao alsa only)
This option will tell MPlayer to use a different channel for controlling
volume than the default PCM.
-Options include
+Options for OSS include
.B 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. alsamixer displays, like
+.B Master, Line, PCM.
.TP
.B \-nowaveheader (\-ao pcm only)
Don't include wave header.