RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-20 06:06:53 +00:00
Code Issues Releases Wiki Activity

Use = instead if # in ALSA device name, as # irritates our config-parser.

Browse Source 
Original patch by stan (at) saticed (dot) me (dot) uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12920 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-07-30 16:15:06 +00:00
parent e5b67089c7
commit 4deb67c3fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/en/mplayer.1
View File

@ -1572,7 +1572,7 @@ See \-ao help for a list of compiled-in drivers.
.RSs .RSs
.IPs "\-ao alsa,oss," .IPs "\-ao alsa,oss,"
Try the ALSA driver, then the OSS driver, then others. 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. Sets noblock-mode, mmap-mode and the device-name as first card, fourth device.
.RE .RE
.PD 1 .PD 1
@ -1594,7 +1594,7 @@ Sets experimental mmap-mode (does not work for more than 2 channels).
Sets noblock-mode. Sets noblock-mode.
.IPs device=<device> .IPs device=<device>
Sets the device name. 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 .RE
.PD 1 .PD 1
.TP .TP

6
libao2/ao_alsa.c
View File

@ -199,7 +199,7 @@ static void parse_device (char *dest, char *src, int len)
strncpy (dest, src, len); strncpy (dest, src, len);
while ((tmp = strrchr(dest, '.'))) while ((tmp = strrchr(dest, '.')))
tmp[0] = ','; tmp[0] = ',';
while ((tmp = strrchr(dest, '#'))) while ((tmp = strrchr(dest, '=')))
tmp[0] = ':'; tmp[0] = ':';
} }
@ -207,7 +207,7 @@ static void print_help ()
{ {
mp_msg (MSGT_AO, MSGL_FATAL, mp_msg (MSGT_AO, MSGL_FATAL,
"\n-ao alsa commandline help:\n" "\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" " sets mmap-mode and first card fourth device\n"
"\nOptions:\n" "\nOptions:\n"
" mmap\n" " mmap\n"
@ -215,7 +215,7 @@ static void print_help ()
" noblock\n" " noblock\n"
" Sets non-blocking mode\n" " Sets non-blocking mode\n"
" device=<device-name>\n" " device=<device-name>\n"
" Sets device (change , to . and : to #)\n"); " Sets device (change , to . and : to =)\n");
} }
/* /*