#include "quakedef.h"
-int cache_full_cycle;
-
-byte *S_Alloc (int size);
+qbyte *S_Alloc (int size);
/*
================
ResampleSfx
================
*/
-void ResampleSfx (sfx_t *sfx, int inrate, byte *data, char *name)
+void ResampleSfx (sfx_t *sfx, int inrate, qbyte *data, char *name)
{
int outcount;
int srcsample, srclength;
int samplefrac, fracstep;
sfxcache_t *sc;
- sc = Cache_Check (&sfx->cache);
+ sc = sfx->sfxcache;
if (!sc)
return;
sfxcache_t *S_LoadSound (sfx_t *s)
{
char namebuffer[256];
- byte *data;
+ qbyte *data;
wavinfo_t info;
int len;
float stepscale;
sfxcache_t *sc;
// see if still in memory
- sc = Cache_Check (&s->cache);
- if (sc)
- return sc;
+ if (s->sfxcache)
+ return s->sfxcache;
//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
// load it in
// Con_Printf ("loading %s\n",namebuffer);
- data = COM_LoadMallocFile(namebuffer, false);
+ data = COM_LoadFile(namebuffer, false);
if (!data)
{
if (info.channels < 1 || info.channels > 2)
{
Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
- qfree(data);
+ Mem_Free(data);
return NULL;
}
/*
}
*/
- stepscale = (float)info.rate / shm->speed;
+ stepscale = (float)info.rate / shm->speed;
len = info.samples / stepscale;
len = len * info.width * info.channels;
- sc = Cache_Alloc ( &s->cache, len + sizeof(sfxcache_t), s->name);
+ // 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)
{
- qfree(data);
+ Mem_Free(data);
return NULL;
}
-
+
sc->length = info.samples;
sc->loopstart = info.loopstart;
sc->speed = info.rate;
ResampleSfx (s, sc->speed, data + info.dataofs, s->name);
- qfree(data);
+ Mem_Free(data);
return sc;
}
*/
-byte *data_p;
-byte *iff_end;
-byte *last_chunk;
-byte *iff_data;
+qbyte *data_p;
+qbyte *iff_end;
+qbyte *last_chunk;
+qbyte *iff_data;
int iff_chunk_len;
GetWavinfo
============
*/
-wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength)
+wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
{
wavinfo_t info;
int i;