- Applied patch from Vincent S. Cojot for solaris. He's

taken his patch against icculus.org's quake2 tree, and applied it to solaris/ and then migrated that stuff to our tree in src/ so it gets built.
2025-05-31 00:41:30 +00:00 · 2002-11-24 05:14:29 +00:00 · 2002-11-24 05:14:29 +00:00 · bd911a47db
commit bd911a47db
parent a937e44276
73 changed files with 17118 additions and 96 deletions
--- a/solaris/snd_sdl.c
+++ b/solaris/snd_sdl.c
@ -0,0 +1,184 @@
+/*
+	snd_sdl.c
+
+	Sound code taken from SDLQuake and modified to work with Quake2
+	Robert Bäuml 2001-12-25
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#include "SDL.h"
+
+#include "../client/client.h"
+#include "../client/snd_loc.h"
+
+static int  snd_inited;
+static dma_t *shm;
+
+static void
+paint_audio (void *unused, Uint8 * stream, int len)
+{
+	if (shm) {
+		shm->buffer = stream;
+		shm->samplepos += len / (shm->samplebits / 4);
+		// Check for samplepos overflow?
+		S_PaintChannels (shm->samplepos);
+	}
+}
+
+qboolean
+SNDDMA_Init (void)
+{
+	SDL_AudioSpec desired, obtained;
+	int desired_bits, freq;
+	
+	if (SDL_WasInit(SDL_INIT_EVERYTHING) == 0) {
+		if (SDL_Init(SDL_INIT_AUDIO) < 0) {
+			Com_Printf ("Couldn't init SDL audio: %s\n", SDL_GetError ());
+			return 0;
+		}
+	} else if (SDL_WasInit(SDL_INIT_AUDIO) == 0) {
+		if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
+			Com_Printf ("Couldn't init SDL audio: %s\n", SDL_GetError ());
+			return 0;
+		}
+	}
+	
+	snd_inited = 0;
+	desired_bits = (Cvar_Get("sndbits", "16", CVAR_ARCHIVE))->value;
+
+	/* Set up the desired format */
+	freq = (Cvar_Get("s_khz", "0", CVAR_ARCHIVE))->value;
+	if (freq == 44)
+		desired.freq = 44100;
+	else if (freq == 22)
+		desired.freq = 22050;
+	else
+		desired.freq = 11025;
+	
+	switch (desired_bits) {
+		case 8:
+			desired.format = AUDIO_U8;
+			break;
+		case 16:
+			if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+				desired.format = AUDIO_S16MSB;
+			else
+				desired.format = AUDIO_S16LSB;
+			break;
+		default:
+			Com_Printf ("Unknown number of audio bits: %d\n", desired_bits);
+			return 0;
+	}
+	desired.channels = (Cvar_Get("sndchannels", "2", CVAR_ARCHIVE))->value;
+	
+	if (desired.freq == 44100)
+		desired.samples = 2048;
+	else if (desired.freq == 22050)
+		desired.samples = 1024;
+	else
+		desired.samples = 512;
+	
+	desired.callback = paint_audio;
+	
+	/* Open the audio device */
+	if (SDL_OpenAudio (&desired, &obtained) < 0) {
+		Com_Printf ("Couldn't open SDL audio: %s\n", SDL_GetError ());
+		return 0;
+	}
+
+	/* Make sure we can support the audio format */
+	switch (obtained.format) {
+		case AUDIO_U8:
+			/* Supported */
+			break;
+		case AUDIO_S16LSB:
+		case AUDIO_S16MSB:
+			if (((obtained.format == AUDIO_S16LSB) &&
+				 (SDL_BYTEORDER == SDL_LIL_ENDIAN)) ||
+				((obtained.format == AUDIO_S16MSB) &&
+				 (SDL_BYTEORDER == SDL_BIG_ENDIAN))) {
+				/* Supported */
+				break;
+			}
+			/* Unsupported, fall through */ ;
+		default:
+			/* Not supported -- force SDL to do our bidding */
+			SDL_CloseAudio ();
+			if (SDL_OpenAudio (&desired, NULL) < 0) {
+				Com_Printf ("Couldn't open SDL audio: %s\n", SDL_GetError ());
+				return 0;
+			}
+			memcpy (&obtained, &desired, sizeof (desired));
+			break;
+	}
+	SDL_PauseAudio (0);
+
+	/* Fill the audio DMA information block */
+	shm = &dma;
+	shm->samplebits = (obtained.format & 0xFF);
+	shm->speed = obtained.freq;
+	shm->channels = obtained.channels;
+	shm->samples = obtained.samples * shm->channels;
+	shm->samplepos = 0;
+	shm->submission_chunk = 1;
+	shm->buffer = NULL;
+
+	snd_inited = 1;
+	return 1;
+}
+
+int
+SNDDMA_GetDMAPos (void)
+{
+	return shm->samplepos;
+}
+
+void
+SNDDMA_Shutdown (void)
+{
+	if (snd_inited) {
+		SDL_CloseAudio ();
+		snd_inited = 0;
+	}
+
+	if (SDL_WasInit(SDL_INIT_EVERYTHING) == SDL_INIT_AUDIO)
+		SDL_Quit();
+	else
+		SDL_QuitSubSystem(SDL_INIT_AUDIO);
+}
+
+/*
+
+	SNDDMA_Submit
+
+	Send sound to device if buffer isn't really the dma buffer
+
+*/
+void
+SNDDMA_Submit (void)
+{
+}
+
+
+void SNDDMA_BeginPainting(void)
+{    
+}