#include "quakedef.h"
-qbyte *S_Alloc (int size);
-
/*
================
ResampleSfx
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;
if (fracstep == 256)
{
+ // fast case for direct transfer
if (sc->width == 1) // 8bit
for (i = 0;i < srclength;i++)
((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128;
}
else
{
-// general case
- Con_DPrintf("ResampleSfx: resampling sound %s\n", name);
+ // general case
samplefrac = 0;
if ((fracstep & 255) == 0) // skipping points on perfect multiple
{
}
// LordHavoc: use this for testing if it ever becomes useful again
-// COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
+ //COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
}
//=============================================================================
/*
==============
-S_LoadSound
+S_LoadWavFile
==============
*/
-sfxcache_t *S_LoadSound (sfx_t *s)
+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 = COM_LoadFile(namebuffer, false);
+ qbyte *data;
+ wavinfo_t info;
+ int len;
+ sfxcache_t *sc;
+ // Load the file
+ data = FS_LoadFile(filename, false);
if (!data)
- {
- Con_Printf ("Couldn't load %s\n", namebuffer);
return NULL;
- }
- info = GetWavinfo (s->name, data, com_filesize);
- // LordHavoc: stereo sounds are now allowed (intended for music)
+ info = GetWavinfo (s->name, data, fs_filesize);
+ // 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;
}
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;
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;
+
+ // 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);
+
+ // TODO: insert Ogg Vorbis support here
+
+ // Can't load the sound!
+ if (sc == NULL)
+ {
+ s->silentlymissing = !complain;
+ if (complain)
+ Con_Printf ("Couldn't load %s\n", namebuffer);
+ return NULL;
+ }
+
+ return sc;
+}
+
+void S_UnloadSound(sfx_t *s)
+{
+ if (s->sfxcache)
+ {
+ s->sfxcache = NULL;
+ Mem_FreePool(&s->mempool);
+ }
+}
+
/*
===============================================================================
*/
-qbyte *data_p;
-qbyte *iff_end;
-qbyte *last_chunk;
-qbyte *iff_data;
-int iff_chunk_len;
+qbyte *data_p;
+qbyte *iff_end;
+qbyte *last_chunk;
+qbyte *iff_data;
+int iff_chunk_len;
short GetLittleShort(void)
void DumpChunks(void)
{
- char str[5];
-
+ char str[5];
+
str[4] = 0;
data_p=iff_data;
do
*/
wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
{
- wavinfo_t info;
- int i;
- int format;
- int samples;
+ wavinfo_t info;
+ int i;
+ int format;
+ int samples;
memset (&info, 0, sizeof(info));
iff_data = wav;
iff_end = wav + wavlength;
-// find "RIFF" chunk
+ // find "RIFF" chunk
FindChunk("RIFF");
if (!(data_p && !strncmp(data_p+8, "WAVE", 4)))
{
return info;
}
-// get "fmt " chunk
+ // get "fmt " chunk
iff_data = data_p + 12;
-// DumpChunks ();
+ //DumpChunks ();
FindChunk("fmt ");
if (!data_p)
data_p += 4+2;
info.width = GetLittleShort() / 8;
-// get cue chunk
+ // get cue chunk
FindChunk("cue ");
if (data_p)
{
data_p += 32;
info.loopstart = GetLittleLong();
- // if the next chunk is a LIST chunk, look for a cue length marker
+ // if the next chunk is a LIST chunk, look for a cue length marker
FindNextChunk ("LIST");
if (data_p)
{
else
info.loopstart = -1;
-// find data chunk
+ // find data chunk
FindChunk("data");
if (!data_p)
{
projects / xonotic / darkplaces.git / blobdiff