From 973d26da3ea23d198d7e6569ab7394e89b588a40 Mon Sep 17 00:00:00 2001 From: Spoike Date: Wed, 15 Jun 2005 15:04:41 +0000 Subject: [PATCH] Let's fix the sound code so it doesn't loop infinatly, shall we? git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1096 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/snd_linux.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/engine/client/snd_linux.c b/engine/client/snd_linux.c index 36836a5f4..b56196923 100644 --- a/engine/client/snd_linux.c +++ b/engine/client/snd_linux.c @@ -71,12 +71,11 @@ static int OSS_InitCard(soundcardinfo_t *sc, int cardnum) soundcardinfo_t *ec; - devname = Cvar_Get("snd_devicename", "/dev/dsp", 0, "Sound controls"); + devname = Cvar_Get(va("snd_devicename%i", cardnum+1), cardnum?"":"/dev/dsp", 0, "Sound controls"); snddev = devname->string; - for (ec = sndcardinfo; ec; ec = ec->next) - if (!strcmp(ec->name, snddev)) - return 2; + if (!*snddev) + return 2; sc->inactive_sound = true; //linux sound devices always play sound, even when we're not the active app... @@ -89,24 +88,8 @@ static int OSS_InitCard(soundcardinfo_t *sc, int cardnum) { perror(snddev); Con_Printf("Could not open %s\n", snddev); - - devname = Cvar_Get("snd_devicename2", "", 0, "Sound controls"); - snddev = devname->string; - if (*snddev) //try a secondary if they named one - { - printf("Initing sound device %s\n", snddev); - sc->audio_fd = open(snddev, O_RDWR | O_NONBLOCK); - - if (sc->audio_fd < 0) - Con_Printf("Could not open %s\n", snddev); - } - - if (sc->audio_fd < 0) - { - Con_Printf("Running without sound\n"); - OSS_Shutdown(sc); - return 0; - } + OSS_Shutdown(sc); + return 0; } Q_strncpyz(sc->name, snddev, sizeof(sc->name));