From 179f1e04d60bf39b24520add2e383b6b4ccc53de Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 14 Jul 2003 15:38:23 +0000
Subject: [PATCH] now reports resamplesfx calls that don't involve resampling
 (of course only if developer is on) now reports if memory allocation failed
 for a sound during loading

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3274 d7cf8633-e32d-0410-b094-e92efae38249
---
 snd_mem.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/snd_mem.c b/snd_mem.c
index b46f90f1..3eab5257 100644
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -36,6 +36,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 	srclength = sc->length << sc->stereo;
 
 	outcount = (double) sc->length * (double) shm->speed / (double) sc->speed;
+	Con_DPrintf("ResampleSfx: resampling sound %s from %dhz to %dhz (%d samples to %d samples)\n", name, sc->speed, shm->speed, sc->length, outcount);
 	sc->length = outcount;
 	if (sc->loopstart != -1)
 		sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed;
@@ -57,7 +58,6 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 	else
 	{
 		// general case
-		Con_DPrintf("ResampleSfx: resampling sound %s\n", name);
 		samplefrac = 0;
 		if ((fracstep & 255) == 0) // skipping points on perfect multiple
 		{
@@ -212,7 +212,7 @@ S_LoadSound
 */
 sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 {
-    char namebuffer[256];
+	char namebuffer[MAX_QPATH];
 	qbyte *data;
 	wavinfo_t info;
 	int len;
@@ -232,7 +232,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	{
 		s->silentlymissing = !complain;
 		if (complain)
-			Con_DPrintf ("Couldn't load %s\n", namebuffer);
+			Con_Printf("Couldn't load %s\n", namebuffer);
 		return NULL;
 	}
 
@@ -240,7 +240,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	// LordHavoc: stereo sounds are now allowed (intended for music)
 	if (info.channels < 1 || info.channels > 2)
 	{
-		Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
+		Con_Printf("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
 		Mem_Free(data);
 		return NULL;
 	}
@@ -255,6 +255,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t));
 	if (!sc)
 	{
+		Con_Printf("failed to allocate memory for sound \"%s\"\n", s->name);
 		Mem_FreePool(&s->mempool);
 		Mem_Free(data);
 		return NULL;
@@ -266,7 +267,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	sc->width = info.width;
 	sc->stereo = info.channels == 2;
 
-	ResampleSfx (sc, data + info.dataofs, s->name);
+	ResampleSfx(sc, data + info.dataofs, s->name);
 
 	Mem_Free(data);
 	return sc;
-- 
2.39.2