X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mem.c;h=519ef0e27924a3049b533a8c6ee33ed64208161e;hb=d192fabc74fe10ad9f173418e765b189278a1075;hp=a2f4e4797756d3eea63db82abea7b2619da9e8c7;hpb=05508fd28461344ad71d3fb9a25e07be53803a05;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mem.c b/snd_mem.c
index a2f4e479..519ef0e2 100644
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -19,131 +19,64 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 #include "snd_main.h"
 #include "snd_ogg.h"
 #include "snd_wav.h"
+#ifdef USEXMP
+#include "snd_xmp.h"
+#endif
+#include "sound.h"
 
+void SCR_PushLoadingScreen (const char *, float);
+void SCR_PopLoadingScreen (qbool);
 
 /*
-================
-ResampleSfx
-================
+====================
+Snd_CreateRingBuffer
+
+If "buffer" is NULL, the function allocates one buffer of "sampleframes" sample frames itself
+(if "sampleframes" is 0, the function chooses the size).
+====================
 */
-size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname)
+snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int sampleframes, void* buffer)
 {
-	size_t srclength, outcount, i;
+	snd_ringbuffer_t *ringbuffer;
 
-	srclength = in_length * in_format->channels;
-	outcount = (double)in_length * shm->format.speed / in_format->speed;
+	// If the caller provides a buffer, it must give us its size
+	if (sampleframes == 0 && buffer != NULL)
+		return NULL;
 
-	Con_DPrintf("ResampleSfx(%s): %d samples @ %dHz -> %d samples @ %dHz\n",
-				sfxname, in_length, in_format->speed, outcount, shm->format.speed);
+	ringbuffer = (snd_ringbuffer_t*)Mem_Alloc(snd_mempool, sizeof (*ringbuffer));
+	memset(ringbuffer, 0, sizeof(*ringbuffer));
+	memcpy(&ringbuffer->format, format, sizeof(ringbuffer->format));
 
-	// Trivial case (direct transfer)
-	if (in_format->speed == shm->format.speed)
+	// If we haven't been given a buffer
+	if (buffer == NULL)
 	{
-		if (in_format->width == 1)
-		{
-			for (i = 0; i < srclength; i++)
-				((signed char*)out_data)[i] = in_data[i] - 128;
-		}
-		else  // if (in_format->width == 2)
-			memcpy (out_data, in_data, srclength * in_format->width);
-	}
+		unsigned int maxframes;
+		size_t memsize;
+
+		if (sampleframes == 0)
+			maxframes = (format->speed + 1) / 2;  // Make the sound buffer large enough for containing 0.5 sec of sound
+		else
+			maxframes = sampleframes;
 
-	// General case (linear interpolation with a fixed-point fractional
-	// step, 18-bit integer part and 14-bit fractional part)
-	// Can handle up to 2^18 (262144) samples per second (> 96KHz stereo)
-	#define FRACTIONAL_BITS 14
-	#define FRACTIONAL_MASK ((1 << FRACTIONAL_BITS) - 1)
-	#define INTEGER_BITS (sizeof(samplefrac)*8 - FRACTIONAL_BITS)
+		memsize = maxframes * format->width * format->channels;
+		ringbuffer->ring = (unsigned char *) Mem_Alloc(snd_mempool, memsize);
+		ringbuffer->maxframes = maxframes;
+	}
 	else
 	{
-		const unsigned int fracstep = (double)in_format->speed / shm->format.speed * (1 << FRACTIONAL_BITS);
-		size_t remain_in = srclength, total_out = 0;
-		unsigned int samplefrac;
-		const qbyte *in_ptr = in_data;
-		qbyte *out_ptr = out_data;
-
-		// Check that we can handle one second of that sound
-		if (in_format->speed * in_format->channels > (1 << INTEGER_BITS))
-			Sys_Error ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))",
-					   in_format->speed, in_format->channels);
-
-		// We work 1 sec at a time to make sure we don't accumulate any
-		// significant error when adding "fracstep" over several seconds, and
-		// also to be able to handle very long sounds.
-		while (total_out < outcount)
-		{
-			size_t tmpcount;
-
-			samplefrac = 0;
-
-			// If more than 1 sec of sound remains to be converted
-			if (outcount - total_out > shm->format.speed)
-				tmpcount = shm->format.speed;
-			else
-				tmpcount = outcount - total_out;
-
-			// Convert up to 1 sec of sound
-			for (i = 0; i < tmpcount; i++)
-			{
-				unsigned int j = 0;
-				unsigned int srcsample = (samplefrac >> FRACTIONAL_BITS) * in_format->channels;
-				int a, b;
-
-				// 16 bit samples
-				if (in_format->width == 2)
-				{
-					for (j = 0; j < in_format->channels; j++, srcsample++)
-					{
-						// No value to interpolate with?
-						if (srcsample + in_format->channels < remain_in)
-						{
-							a = ((const short*)in_ptr)[srcsample];
-							b = ((const short*)in_ptr)[srcsample + in_format->channels];
-							*((short*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
-						}
-						else
-							*((short*)out_ptr) = ((const short*)in_ptr)[srcsample];
-
-						out_ptr += sizeof (short);
-					}
-				}
-				// 8 bit samples
-				else  // if (in_format->width == 1)
-				{
-					for (j = 0; j < in_format->channels; j++, srcsample++)
-					{
-						// No more value to interpolate with?
-						if (srcsample + in_format->channels < remain_in)
-						{
-							a = ((const qbyte*)in_ptr)[srcsample] - 128;
-							b = ((const qbyte*)in_ptr)[srcsample + in_format->channels] - 128;
-							*((signed char*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
-						}
-						else
-							*((signed char*)out_ptr) = ((const qbyte*)in_ptr)[srcsample] - 128;
-
-						out_ptr += sizeof (signed char);
-					}
-				}
-
-				samplefrac += fracstep;
-			}
-
-			// Update the counters and the buffer position
-			remain_in -= in_format->speed * in_format->channels;
-			in_ptr += in_format->speed * in_format->channels * in_format->width;
-			total_out += tmpcount;
-		}
+		ringbuffer->ring = (unsigned char *) buffer;
+		ringbuffer->maxframes = sampleframes;
 	}
 
-	return outcount;
+	return ringbuffer;
 }
 
+
 //=============================================================================
 
 /*
@@ -151,68 +84,91 @@ size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t*
 S_LoadSound
 ==============
 */
-qboolean S_LoadSound (sfx_t *s, qboolean complain)
+qbool S_LoadSound (sfx_t *sfx, qbool complain)
 {
-	char namebuffer[MAX_QPATH];
+	char namebuffer[MAX_QPATH + 16];
 	size_t len;
-	qboolean modified_name = false;
 
-	if (!shm || !shm->format.speed)
-		return false;
+	// See if already loaded
+	if (sfx->fetcher != NULL)
+		return true;
 
 	// If we weren't able to load it previously, no need to retry
-	if (s->flags & SFXFLAG_FILEMISSING)
+	// Note: S_PrecacheSound clears this flag to cause a retry
+	if (sfx->flags & SFXFLAG_FILEMISSING)
 		return false;
 
-	// See if in memory
-	if (s->fetcher != NULL)
-	{
-		if (s->format.speed != shm->format.speed)
-			Sys_Error ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name);
-		return true;
-	}
-
-	len = strlcpy (namebuffer, s->name, sizeof (namebuffer));
-	if (len >= sizeof (namebuffer))
+	// No sound?
+	if (snd_renderbuffer == NULL)
 		return false;
 
-	// Try to load it as a WAV file
-	if (S_LoadWavFile (namebuffer, s))
-		return true;
+	// Initialize volume peak to 0; if ReplayGain is supported, the loader will change this away
+	sfx->volume_peak = 0.0;
+
+	if (developer_loading.integer)
+		Con_Printf("loading sound %s\n", sfx->name);
+
+	SCR_PushLoadingScreen(sfx->name, 1);
 
-	// Else, try to load it as an Ogg Vorbis file
-	if (!strcasecmp (namebuffer + len - 4, ".wav"))
+	// LadyHavoc: if the sound filename does not begin with sound/, try adding it
+	if (strncasecmp(sfx->name, "sound/", 6))
 	{
-		strcpy (namebuffer + len - 3, "ogg");
-		modified_name = true;
+		dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name);
+		len = strlen(namebuffer);
+		if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
+		{
+			if (S_LoadWavFile (namebuffer, sfx))
+				goto loaded;
+			memcpy (namebuffer + len - 3, "ogg", 4);
+		}
+		if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
+		{
+			if (OGG_LoadVorbisFile (namebuffer, sfx))
+				goto loaded;
+		}
+#ifdef USEXMP
+		else if (len >= 1)
+		{
+			if (XMP_LoadModFile (namebuffer, sfx))
+				goto loaded;
+		}
+#endif
 	}
-	if (OGG_LoadVorbisFile (namebuffer, s))
-		return true;
 
-	// Can't load the sound!
-	s->flags |= SFXFLAG_FILEMISSING;
-	if (complain)
+	// LadyHavoc: then try without the added sound/ as wav and ogg
+	dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name);
+	len = strlen(namebuffer);
+	// request foo.wav: tries foo.wav, then foo.ogg
+	// request foo.ogg: tries foo.ogg only
+	// request foo.mod: tries foo.mod only
+	if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
 	{
-		if (modified_name)
-			strcpy (namebuffer + len - 3, "wav");
-		Con_Printf("Couldn't load %s\n", namebuffer);
+		if (S_LoadWavFile (namebuffer, sfx))
+			goto loaded;
+		memcpy (namebuffer + len - 3, "ogg", 4);
 	}
-	return false;
-}
-
-void S_UnloadSound (sfx_t *s)
-{
-	if (s->fetcher != NULL)
+	if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
+	{
+		if (OGG_LoadVorbisFile (namebuffer, sfx))
+			goto loaded;
+	}
+#ifdef USEXMP
+	else if (len >= 1)
 	{
-		unsigned int i;
+		if (XMP_LoadModFile (namebuffer, sfx))
+			goto loaded;
+	}
+#endif
 
-		// Stop all channels that use this sound
-		for (i = 0; i < total_channels ; i++)
-			if (channels[i].sfx == s)
-				S_StopChannel (i);
+	// Can't load the sound!
+	sfx->flags |= SFXFLAG_FILEMISSING;
+	if (complain)
+		Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name);
 
-		s->fetcher = NULL;
-		s->fetcher_data = NULL;
-		Mem_FreePool(&s->mempool);
-	}
+	SCR_PopLoadingScreen(false);
+	return false;
+
+loaded:
+	SCR_PopLoadingScreen(false);
+	return true;
 }