qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Beg for mmap access.

Browse source 
If the default sound device does not support mmap access, retry with
plughw. However, assume the user knows best and do not retry if snd_device
has been set to anything, including "default".

QF alsa support now works out of the box with pulseaudio.
This commit is contained in:
Bill Currie 2011-12-08 11:32:33 +09:00
parent 45288a1a7f
commit d3cf5c4b75
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/audio/targets/snd_alsa.c
View file

@ -227,14 +227,13 @@ SNDDMA_Init (void)
stereo = snd_stereo->int_val;
if (!pcmname)
pcmname = "default";
retry_open:
err = qfsnd_pcm_open (&pcm, pcmname, SND_PCM_STREAM_PLAYBACK,
SND_PCM_NONBLOCK);
if (0 > err) {
Sys_Printf ("Error: audio open error: %s\n", qfsnd_strerror (err));
return 0;
}
Sys_Printf ("Using PCM %s.\n", pcmname);
err = qfsnd_pcm_hw_params_any (pcm, hw);
if (0 > err) {
@ -253,11 +252,18 @@ SNDDMA_Init (void)
if (0 > err) {
Sys_MaskPrintf (SYS_SND, "ALSA: Failure to set noninterleaved PCM "
"access. %s\n", qfsnd_strerror (err));
// "default" did not work, so retry with "plughw". However do not
// second guess the user, even if the user specified "default".
if (!snd_device->string[0] && !strcmp (pcmname, "default")) {
pcmname = "plughw";
goto retry_open;
}
Sys_Printf ("ALSA: could not set mmap access\n");
goto error;
}
sn.xfer = SNDDMA_ni_xfer;
}
Sys_Printf ("Using PCM %s.\n", pcmname);
switch (bps) {