cd audio now tied to sound system

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index c01c479b4c4449409df0707adf89cde2d5ba5afb..27414ea83764a6bce317156b98ecfaf60e9c9d0e 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-qbyte *S_Alloc (int size);
-
 /*
 ================
 ResampleSfx
@@ -38,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;
@@ -59,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
                {
@@ -214,19 +212,20 @@ 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;
        sfxcache_t *sc;
 
        // see if still in memory
-       if (s->sfxcache)
+       if (!shm || !shm->speed)
+               return NULL;
+       if (s->sfxcache && s->sfxcache->speed == shm->speed)
                return s->sfxcache;
 
        // load it in
-       strcpy(namebuffer, "sound/");
-       strcat(namebuffer, s->name);
+       snprintf(namebuffer, sizeof(namebuffer), "sound/%s", s->name);
 
        data = FS_LoadFile(namebuffer, false);
 
@@ -234,7 +233,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
        {
                s->silentlymissing = !complain;
                if (complain)
-                       Con_Printf ("Couldn't load %s\n", namebuffer);
+                       Con_Printf("Couldn't load %s\n", namebuffer);
                return NULL;
        }
 
@@ -242,7 +241,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;
        }
@@ -257,6 +256,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;
@@ -268,12 +268,20 @@ 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;
 }
 
+void S_UnloadSound(sfx_t *s)
+{
+       if (s->sfxcache)
+       {
+               s->sfxcache = NULL;
+               Mem_FreePool(&s->mempool);
+       }
+}
 
 
 /*