Merge pull request #298 from bxaimc/master

Add .POS looping for .Ogg (SNK Heroines, Sonic Mania)
This commit is contained in:
Christopher Snowhill 2018-09-21 17:37:03 -07:00 committed by GitHub
commit 771b539291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,5 @@
#include "meta.h" #include "meta.h"
/* .pos - loop points for .wav [Ys I Complete (PC); reused for manual looping] */ /* .pos - loop points for .wav [Ys I Complete (PC); reused for manual looping] */
VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
@ -15,11 +14,22 @@ VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) {
goto fail; goto fail;
streamData = open_streamfile_by_ext(streamFile, "wav"); streamData = open_streamfile_by_ext(streamFile, "wav");
if (!streamData) goto fail; if (streamData) {
/* let the real initer do the parsing */
vgmstream = init_vgmstream_riff(streamData); vgmstream = init_vgmstream_riff(streamData);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->meta_type = meta_RIFF_WAVE_POS;
}
else {
/* hack for Ogg with external loops */
streamData = open_streamfile_by_ext(streamFile, "ogg");
if (streamData) {
vgmstream = init_vgmstream_ogg_vorbis(streamData);
if (!vgmstream) goto fail;
}
else {
goto fail;
}
}
close_streamfile(streamData); close_streamfile(streamData);
streamData = NULL; streamData = NULL;
@ -27,10 +37,11 @@ VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) {
/* install loops (wrong values are validated later) */ /* install loops (wrong values are validated later) */
loop_start = read_32bitLE(0x00, streamFile); loop_start = read_32bitLE(0x00, streamFile);
loop_end = read_32bitLE(0x04, streamFile); loop_end = read_32bitLE(0x04, streamFile);
if (loop_end <= 0 || (loop_end > vgmstream->num_samples)) {
loop_end = vgmstream->num_samples;
}
vgmstream_force_loop(vgmstream, 1, loop_start, loop_end); vgmstream_force_loop(vgmstream, 1, loop_start, loop_end);
vgmstream->meta_type = meta_RIFF_WAVE_POS;
return vgmstream; return vgmstream;
fail: fail: