qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 15:51:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

looped oggs now work so long as they have a CUEPOINT= comment

Browse source
This commit is contained in:
Bill Currie 2002-07-29 22:25:32 +00:00
parent 5d14e327aa
commit 5fd916a0da
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/audio/renderer/vorbis.c
View file

@ -95,7 +95,9 @@ SND_LoadOgg (VFile *file, sfx_t *sfx, cache_allocator_t allocator)
long samples, size; long samples, size;
byte *data, *d; byte *data, *d;
int current_section; int current_section;
int sample_start = -1, sample_count = 0;
sfxcache_t *sc = 0; sfxcache_t *sc = 0;
char **ptr;
if (ov_open_callbacks (file, &vf, 0, 0, callbacks) < 0) { if (ov_open_callbacks (file, &vf, 0, 0, callbacks) < 0) {
Sys_Printf ("Input does not appear to be an Ogg bitstream.\n"); Sys_Printf ("Input does not appear to be an Ogg bitstream.\n");
@ -103,12 +105,19 @@ SND_LoadOgg (VFile *file, sfx_t *sfx, cache_allocator_t allocator)
} }
vi = ov_info (&vf, -1); vi = ov_info (&vf, -1);
samples = ov_pcm_total (&vf, -1); samples = ov_pcm_total (&vf, -1);
for (ptr = ov_comment (&vf, -1)->user_comments; *ptr; ptr++) {
Sys_DPrintf ("%s\n", *ptr);
if (strncmp ("CUEPOINT=", *ptr, 9) == 0) {
sscanf (*ptr + 9, "%d %d", &sample_start, &sample_count);
} else {
sample_count = samples;
}
}
if (sample_start != -1)
samples = sample_count;
size = samples * vi->channels * 2; size = samples * vi->channels * 2;
if (developer->int_val) { if (developer->int_val) {
char **ptr = ov_comment (&vf, -1)->user_comments;
while (*ptr)
Sys_Printf ("%s\n", *ptr++);
Sys_Printf ("\nBitstream is %d channel, %ldHz\n", Sys_Printf ("\nBitstream is %d channel, %ldHz\n",
vi->channels, vi->rate); vi->channels, vi->rate);
Sys_Printf ("\nDecoded length: %ld samples (%ld bytes)\n", Sys_Printf ("\nDecoded length: %ld samples (%ld bytes)\n",
@ -135,7 +144,7 @@ SND_LoadOgg (VFile *file, sfx_t *sfx, cache_allocator_t allocator)
break; break;
} }
} }
sc->loopstart = -1; //FIXME this breaks looped sounds sc->loopstart = sample_start;
SND_ResampleSfx (sc, data); SND_ResampleSfx (sc, data);
bail: bail:
if (data) if (data)