X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mem.c;h=c620d23664392e2f530a2922f0b4545b1984ed21;hb=2d72ce3837ec27364107a13c42ac21a31775621e;hp=b46f90f183f856dafa795c03c5cee512057db914;hpb=5cf8eacc9621cf85f9d0474e59289b13d083260f;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mem.c b/snd_mem.c
index b46f90f1..c620d236 100644
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+#include "ogg.h"
+
+
 /*
 ================
 ResampleSfx
@@ -36,6 +39,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 +61,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
 		{
@@ -207,40 +210,30 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 
 /*
 ==============
-S_LoadSound
+S_LoadWavFile
 ==============
 */
-sfxcache_t *S_LoadSound (sfx_t *s, int complain)
+sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s)
 {
-    char namebuffer[256];
 	qbyte *data;
 	wavinfo_t info;
 	int len;
 	sfxcache_t *sc;
 
-	// see if still in memory
-	if (s->sfxcache)
-		return s->sfxcache;
-
-	// load it in
-	strcpy(namebuffer, "sound/");
-	strcat(namebuffer, s->name);
-
-	data = FS_LoadFile(namebuffer, false);
-
+	// Load the file
+	data = FS_LoadFile(filename, false);
 	if (!data)
-	{
-		s->silentlymissing = !complain;
-		if (complain)
-			Con_DPrintf ("Couldn't load %s\n", namebuffer);
 		return NULL;
-	}
+
+	// Don't try to load it if it's not a WAV file
+	if (memcmp (data, "RIFF", 4) || memcmp (data + 8, "WAVE", 4))
+		return NULL;
 
 	info = GetWavinfo (s->name, data, fs_filesize);
-	// LordHavoc: stereo sounds are now allowed (intended for music)
+	// Stereo sounds are 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;
 	}
@@ -249,12 +242,12 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate);
 	len = len * info.width * info.channels;
 
-	// FIXME: add S_UnloadSounds or something?
 	Mem_FreePool(&s->mempool);
 	s->mempool = Mem_AllocPool(s->name);
 	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,13 +259,73 @@ 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;
 }
 
 
+/*
+==============
+S_LoadSound
+==============
+*/
+sfxcache_t *S_LoadSound (sfx_t *s, int complain)
+{
+	char namebuffer[MAX_QPATH];
+	size_t len;
+	sfxcache_t *sc;
+	qboolean modified_name = false;
+
+	// see if still in memory
+	if (!shm || !shm->speed)
+		return NULL;
+	if (s->sfxcache && (s->sfxcache->speed == shm->speed))
+		return s->sfxcache;
+
+	len = snprintf (namebuffer, sizeof (namebuffer), "sound/%s", s->name);
+	if (len >= sizeof (namebuffer))
+		return NULL;
+
+	// Try to load it as a WAV file
+	sc = S_LoadWavFile (namebuffer, s);
+	if (sc != NULL)
+		return sc;
+
+	// Else, try to load it as an Ogg Vorbis file
+	if (!strcasecmp (namebuffer + len - 4, ".wav"))
+	{
+		strcpy (namebuffer + len - 3, "ogg");
+		modified_name = true;
+	}
+	sc = OGG_LoadVorbisFile (namebuffer, s);
+	if (sc != NULL)
+		return sc;
+
+	// Can't load the sound!
+	if (!complain)
+		s->flags |= SFXFLAG_SILENTLYMISSING;
+	else
+		s->flags &= ~SFXFLAG_SILENTLYMISSING;
+	if (complain)
+	{
+		if (modified_name)
+			strcpy (namebuffer + len - 3, "wav");
+		Con_Printf ("Couldn't load %s\n", namebuffer);
+	}
+	return NULL;
+}
+
+void S_UnloadSound(sfx_t *s)
+{
+	if (s->sfxcache)
+	{
+		s->sfxcache = NULL;
+		Mem_FreePool(&s->mempool);
+	}
+}
+
 
 /*
 ===============================================================================