Mercurial > mplayer.hg
changeset 12919:aba44b58dea7
Use = instead if # in ALSA device name, as # irritates our config-parser.
Original patch by stan (at) saticed (dot) me (dot) uk
| author | reimar |
|---|---|
| date | Fri, 30 Jul 2004 16:15:06 +0000 |
| parents | eb0d3c1b6c6d |
| children | fa02d0766f46 |
| files | DOCS/man/en/mplayer.1 libao2/ao_alsa.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Fri Jul 30 15:58:36 2004 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Jul 30 16:15:06 2004 +0000 @@ -1572,7 +1572,7 @@ .RSs .IPs "\-ao alsa,oss," Try the ALSA driver, then the OSS driver, then others. -.IPs "\-ao alsa:mmap:noblock:device=hw#0.3" +.IPs "\-ao alsa:mmap:noblock:device=hw=0.3" Sets noblock-mode, mmap-mode and the device-name as first card, fourth device. .RE .PD 1 @@ -1594,7 +1594,7 @@ Sets noblock-mode. .IPs device=<device> Sets the device name. -Replace any ',' with '.' and any ':' with '#' in the ALSA device name. +Replace any ',' with '.' and any ':' with '=' in the ALSA device name. .RE .PD 1 .TP
--- a/libao2/ao_alsa.c Fri Jul 30 15:58:36 2004 +0000 +++ b/libao2/ao_alsa.c Fri Jul 30 16:15:06 2004 +0000 @@ -199,7 +199,7 @@ strncpy (dest, src, len); while ((tmp = strrchr(dest, '.'))) tmp[0] = ','; - while ((tmp = strrchr(dest, '#'))) + while ((tmp = strrchr(dest, '='))) tmp[0] = ':'; } @@ -207,7 +207,7 @@ { mp_msg (MSGT_AO, MSGL_FATAL, "\n-ao alsa commandline help:\n" - "Example: mplayer -ao alsa:mmap:device=hw#0.3\n" + "Example: mplayer -ao alsa:mmap:device=hw=0.3\n" " sets mmap-mode and first card fourth device\n" "\nOptions:\n" " mmap\n" @@ -215,7 +215,7 @@ " noblock\n" " Sets non-blocking mode\n" " device=<device-name>\n" - " Sets device (change , to . and : to #)\n"); + " Sets device (change , to . and : to =)\n"); } /*