qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor cleanups

Browse source
This commit is contained in:
Bill Currie 2003-04-15 04:03:02 +00:00
parent 130a3f4d59
commit 5505aba316
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/snd_render.h
View file

@ -156,7 +156,6 @@ extern channel_t channels[MAX_CHANNELS];
// 0 to MAX_DYNAMIC_CHANNELS-1 = normal entity sounds // 0 to MAX_DYNAMIC_CHANNELS-1 = normal entity sounds
// MAX_DYNAMIC_CHANNELS to MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS -1 = water, etc // MAX_DYNAMIC_CHANNELS to MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS -1 = water, etc
// MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS to total_channels = static sounds // MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS to total_channels = static sounds
extern int sound_delta;
extern int total_channels; extern int total_channels;
#endif//__snd_render_h #endif//__snd_render_h

7
libs/audio/renderer/snd_mem.c
View file

@ -125,9 +125,6 @@ read_samples (sfxbuffer_t *buffer, int count)
sfxstream_t *stream = (sfxstream_t *) sfx->data; sfxstream_t *stream = (sfxstream_t *) sfx->data;
wavinfo_t *info = &stream->wavinfo; wavinfo_t *info = &stream->wavinfo;
if (count <= 0)
Sys_Error ("read_samples: count <= 0");
stepscale = (float) info->rate / shm->speed; // usually 0.5, 1, or 2 stepscale = (float) info->rate / shm->speed; // usually 0.5, 1, or 2
samples = count * stepscale; samples = count * stepscale;
@ -166,8 +163,6 @@ SND_StreamAdvance (sfxbuffer_t *buffer, int count)
headpos = sfx->length; headpos = sfx->length;
else else
headpos -= sfx->length - sfx->loopstart; headpos -= sfx->length - sfx->loopstart;
if (headpos > sfx->length)
Sys_Error ("huh");
} }
if (samples < count) { if (samples < count) {
@ -549,7 +544,7 @@ SND_ResampleStereo (sfxbuffer_t *sc, byte *data, int length)
{ {
byte *x = sc->data + sc->length * outwidth * 2; byte *x = sc->data + sc->length * outwidth * 2;
if (memcmp (x, "\xde\xad\xbe\xef", 4)) if (memcmp (x, "\xde\xad\xbe\xef", 4))
Sys_Error ("SND_ResampleMono screwed the pooch %02x%02x%02x%02x", Sys_Error ("SND_ResampleStereo screwed the pooch %02x%02x%02x%02x",
x[0], x[1], x[2], x[3]); x[0], x[1], x[2], x[3]);
} }
} }