qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

90% there for cache wav support. will likely segfault :)

Browse source
This commit is contained in:
Bill Currie 2003-04-11 04:39:51 +00:00
parent af114732ef
commit 8012a408b8
2 changed files with 72 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/snd_render.h
View file

@ -60,7 +60,7 @@ typedef struct sfxstream_s {
typedef struct sfxblock_s {
sfx_t *sfx;
const char *file;
void *file;
int bytes;
cache_user_t cache;
} sfxblock_t;

71
libs/audio/renderer/wav.c
View file

@ -37,6 +37,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include "QF/cvar.h"
#include "QF/sound.h"
@ -47,6 +48,41 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "snd_render.h"
typedef struct {
const char *name;
int data_start;
int data_length;
} wavfile_t;
static void
wav_callback_load (void *object, cache_allocator_t allocator)
{
sfxblock_t *block = (sfxblock_t *) object;
sfx_t *sfx = block->sfx;
wavfile_t *wavfile = (wavfile_t *) block->file;
QFile *file;
byte *data;
sfxbuffer_t *buffer;
QFS_FOpenFile (block->file, &file);
if (!file)
return; //FIXME Sys_Error?
Qseek (file, wavfile->data_start, SEEK_SET);
data = malloc (wavfile->data_length);
Qread (file, data, wavfile->data_length);
Qclose (file);
buffer = SND_GetCache (sfx->length, sfx->speed, sfx->width, sfx->channels,
block, allocator);
SND_ResampleSfx (sfx, buffer, data);
free (data);
}
static void
stream_wav (sfx_t *sfx, wavfile_t *wavfile)
{
}
void
SND_LoadWav (QFile *file, sfx_t *sfx, char *realname)
@ -69,6 +105,8 @@ SND_LoadWav (QFile *file, sfx_t *sfx, char *realname)
riff_ltxt_t *ltxt;
riff_d_ltxt_t *dltxt = 0;
wavfile_t *wavfile;
int loop_start = -1, sample_count = -1;
if (!(riff = riff_read (file))) {
@ -116,6 +154,39 @@ SND_LoadWav (QFile *file, sfx_t *sfx, char *realname)
Sys_Printf ("missing data chunk\n");
goto bail;
}
if (dfmt->format_tag != 1) {
Sys_Printf ("not Microsfot PCM\n");
goto bail;
}
if (dfmt->channels < 1 || dfmt->channels > 2) {
Sys_Printf ("unsupported channel count\n");
goto bail;
}
sfx->width = dfmt->bits_per_sample / 8;
sfx->length = data->ck.len / sfx->width;
sfx->speed = dfmt->samples_per_sec;
sfx->channels = dfmt->channels;
wavfile = malloc (sizeof (wavfile_t));
wavfile->name = realname;
wavfile->data_start = *(int *)data->data;
wavfile->data_length = data->ck.len;
if (sfx->length < 3 * shm->speed) {
sfxblock_t *block = calloc (1, sizeof (sfxblock_t));
sfx->data = block;
sfx->retain = SND_CacheRetain;
sfx->release = SND_CacheRelease;
block->sfx = sfx;
block->file = wavfile;
Cache_Add (&block->cache, block, wav_callback_load);
} else {
sfx->retain = SND_StreamRetain;
sfx->release = SND_StreamRelease;
free (realname);
stream_wav (sfx, wavfile);
}
if (dltxt)
sample_count = dltxt->len;
if (cp)