Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-29 00:34:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix seeking with "ignore fade" set

Browse Source
This commit is contained in:
bnnm 2020-08-22 13:40:01 +02:00
parent c0f5a48aff
commit e42aebf945
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/render.c
View File

@ -491,13 +491,13 @@ int render_vgmstream(sample_t* buf, int32_t sample_count, VGMSTREAM* vgmstream)
/*****************************************************************************/ /*****************************************************************************/
static void seek_force_loop(VGMSTREAM* vgmstream) { static void seek_force_loop(VGMSTREAM* vgmstream, int loop_count) {
/* only called after hit loop */ /* only called after hit loop */
if (!vgmstream->hit_loop) if (!vgmstream->hit_loop)
return; return;
/* pretend decoder reached loop end so state is set to loop start */ /* pretend decoder reached loop end so state is set to loop start */
vgmstream->loop_count = 0; vgmstream->loop_count = loop_count - 1; /* seeking to first loop musy become ++ > 0 */
vgmstream->current_sample = vgmstream->loop_end_sample; vgmstream->current_sample = vgmstream->loop_end_sample;
vgmstream_do_loop(vgmstream); vgmstream_do_loop(vgmstream);
} }
@ -647,7 +647,7 @@ void seek_vgmstream(VGMSTREAM* vgmstream, int32_t seek_sample) {
if (vgmstream->current_sample < vgmstream->loop_start_sample if (vgmstream->current_sample < vgmstream->loop_start_sample
|| vgmstream->current_sample < vgmstream->loop_end_sample) { || vgmstream->current_sample < vgmstream->loop_end_sample) {
//;VGM_LOG("SEEK: current outside loop area / curr=%i, ls=%i, le=%i\n", vgmstream->current_sample, vgmstream->current_sample, vgmstream->loop_end_sample); //;VGM_LOG("SEEK: current outside loop area / curr=%i, ls=%i, le=%i\n", vgmstream->current_sample, vgmstream->current_sample, vgmstream->loop_end_sample);
seek_force_loop(vgmstream); seek_force_loop(vgmstream, 0);
} }
@ -657,10 +657,16 @@ void seek_vgmstream(VGMSTREAM* vgmstream, int32_t seek_sample) {
loop_seek = loop_seek % loop_body; loop_seek = loop_seek % loop_body;
loop_curr = vgmstream->current_sample - vgmstream->loop_start_sample; loop_curr = vgmstream->current_sample - vgmstream->loop_start_sample;
/* when "ignore fade" is used and seek falls into non-fade part, this needs to seek right before it
so when calling seek_force_loop detection kicks in, and non-fade then decodes normally */
if (vgmstream->loop_target && vgmstream->loop_target == loop_count) {
loop_seek = loop_body;
}
//;VGM_LOG("SEEK: in loop / seekl=%i, loops=%i, cur=%i, dec=%i\n", loop_seek, loop_count, loop_curr, decode_samples); //;VGM_LOG("SEEK: in loop / seekl=%i, loops=%i, cur=%i, dec=%i\n", loop_seek, loop_count, loop_curr, decode_samples);
if (loop_seek < loop_curr) { if (loop_seek < loop_curr) {
decode_samples += loop_seek; decode_samples += loop_seek;
seek_force_loop(vgmstream); seek_force_loop(vgmstream, loop_count);
//;VGM_LOG("SEEK: loop reset / dec=%i, loop=%i\n", decode_samples, loop_count); //;VGM_LOG("SEEK: loop reset / dec=%i, loop=%i\n", decode_samples, loop_count);
} }
@ -699,9 +705,5 @@ void seek_vgmstream(VGMSTREAM* vgmstream, int32_t seek_sample) {
seek_force_decode(vgmstream, decode_samples); seek_force_decode(vgmstream, decode_samples);
/* adjust positions */
if (vgmstream->loop_count >= 0)
vgmstream->loop_count = loop_count;
vgmstream->pstate.play_position = seek_sample; vgmstream->pstate.play_position = seek_sample;
} }