From 21ad4f575933783d5bbf128c16f3703839a94e60 Mon Sep 17 00:00:00 2001 From: Zachary Hall Date: Wed, 10 Apr 2024 18:16:52 -0700 Subject: [PATCH] Fix looping and length getting of non-loop metadata holding files --- playback.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/playback.cpp b/playback.cpp index 32d7028..ec2d0e5 100644 --- a/playback.cpp +++ b/playback.cpp @@ -91,9 +91,13 @@ void PlaybackInstance::SDLCallbackInner(Uint8 *stream, int len) { if (this->stream != nullptr) { size_t samples = (int)bytes_per_iter / sizeof(SAMPLETYPE) / this->stream->channels; #ifdef SOUNDTOUCH_INTEGER_SAMPLES - samples = render_vgmstream((sample_t*)(buf), (int)samples, this->stream); + size_t new_samples = render_vgmstream((sample_t*)(buf), (int)samples, this->stream); #else - samples = render_vgmstream((sample_t*)(buf), (int)samples, this->stream); + size_t new_samples = render_vgmstream((sample_t*)(buf), (int)samples, this->stream); + if (samples > new_samples) { + reset_vgmstream(this->stream); + } + samples = new_samples; vgmstream_spec.samples = samples; SDL_AudioStreamPut(sdl_stream, buf, samples * sizeof(sample_t) * this->stream->channels); new_bufsize = SDL_AudioStreamGet(sdl_stream, buf, bufsize); @@ -178,14 +182,12 @@ VGMSTREAM *PlaybackInstance::Load2(const char *file) { vgmstream_cfg_t cfg = {0}; cfg.allow_play_forever = 1; cfg.play_forever = 1; - cfg.force_loop = 1; - cfg.really_force_loop = 1; - cfg.disable_config_override = 1; + //cfg.disable_config_override = 1; vgmstream_apply_config(output, &cfg); vgmstream_spec.channels = output->channels; vgmstream_spec.freq = output->sample_rate; - length = (double)output->loop_end_sample / (double)output->sample_rate; + length = (double)output->num_samples / (double)output->sample_rate; update.store(true); current_file_mutex.lock(); current_file = std::string(file);