nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Try and get alsa to start up and work a bit more reliably, an impossible task, I know.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3192 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-05-20 17:28:15 +00:00
parent 88085a1cbc
commit 80e511ec1e
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/client/snd_alsa.c
View file

@ -225,7 +225,7 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
memset(hw, 0, psnd_pcm_hw_params_sizeof()); memset(hw, 0, psnd_pcm_hw_params_sizeof());
//WARNING: 'default' as the default sucks arse. it adds about a second's worth of lag. //WARNING: 'default' as the default sucks arse. it adds about a second's worth of lag.
devname = Cvar_Get(va("snd_alsadevice%i", cardnum+1), cardnum==0?"hw":"", 0, "Sound controls"); devname = Cvar_Get(va("snd_alsadevice%i", cardnum+1), (cardnum==0?"hw":(cardnum==1?"default":"")), 0, "Sound controls");
pcmname = devname->string; pcmname = devname->string;
if (!*pcmname) if (!*pcmname)
@ -239,13 +239,13 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
sc->inactive_sound = true; //linux sound devices always play sound, even when we're not the active app... sc->inactive_sound = true; //linux sound devices always play sound, even when we're not the active app...
Con_Printf("Initing ALSA sound device %s\n", pcmname); Con_Printf("Initing ALSA sound device \"%s\"\n", pcmname);
err = psnd_pcm_open (&pcm, pcmname, SND_PCM_STREAM_PLAYBACK, err = psnd_pcm_open (&pcm, pcmname, SND_PCM_STREAM_PLAYBACK,
SND_PCM_NONBLOCK); SND_PCM_NONBLOCK);
if (0 > err) if (0 > err)
{ {
Con_Printf (CON_ERROR "Error: audio open error: %s\n", psnd_strerror (err)); Con_Printf (CON_ERROR "Error: open error: %s\n", psnd_strerror (err));
return 0; return 0;
} }
Con_Printf ("ALSA: Using PCM %s.\n", pcmname); Con_Printf ("ALSA: Using PCM %s.\n", pcmname);
@ -408,6 +408,20 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
sc->handle = pcm; sc->handle = pcm;
ALSA_GetDMAPos (sc); // sets shm->buffer ALSA_GetDMAPos (sc); // sets shm->buffer
//alsa doesn't seem to like high mixahead values
//(maybe it tells us above somehow...)
//so force it lower
//quake's default of 0.2 was for 10fps rendering anyway
//so force it down to 0.1 which is the default for halflife at least, and should give better latency
{
extern cvar_t _snd_mixahead;
if (_snd_mixahead.value >= 0.2)
{
Con_Printf("Alsa Hack: _snd_mixahead forced lower\n");
_snd_mixahead.value = 0.1;
}
}
return true; return true;
error: error: