chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

VGMStream: Fix one shot files actually decoding to completion instead of getting stuck forever

Browse source
This commit is contained in:
Christopher Snowhill 2021-06-15 01:34:01 -07:00
parent cae132ad79
commit 75a4f1e722
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Plugins/vgmstream/vgmstream/VGMDecoder.h
View file

@ -29,6 +29,7 @@
VGMSTREAM *stream;
BOOL playForever;
BOOL canPlayForever;
int sampleRate;
int channels;
int bitrate;

31
Plugins/vgmstream/vgmstream/VGMDecoder.m
View file

@ -223,7 +223,13 @@
vgmstream_mixing_autodownmix(stream, 6);
playForever = IsRepeatOneSet();
canPlayForever = stream->loop_flag;
if (canPlayForever) {
playForever = IsRepeatOneSet();
}
else {
playForever = NO;
}
vgmstream_cfg_t vcfg = {0};
@ -266,18 +272,21 @@
- (int)readAudio:(void *)buf frames:(UInt32)frames
{
BOOL repeatone = IsRepeatOneSet();
UInt32 framesMax = frames;
if (repeatone != playForever) {
playForever = repeatone;
vgmstream_set_play_forever(stream, repeatone);
if (canPlayForever) {
BOOL repeatone = IsRepeatOneSet();
if (repeatone != playForever) {
playForever = repeatone;
vgmstream_set_play_forever(stream, repeatone);
}
}
if (framesRead + frames > totalFrames && !playForever)
frames = totalFrames - framesRead;
if (frames > framesMax)
frames = 0;
frames = 0; // integer overflow?
if (frames) {
sample * sbuf = (sample *) buf;
@ -292,11 +301,13 @@
- (long)seek:(long)frame
{
BOOL repeatone = IsRepeatOneSet();
if (canPlayForever) {
BOOL repeatone = IsRepeatOneSet();
if (repeatone != playForever) {
playForever = repeatone;
vgmstream_set_play_forever(stream, repeatone);
if (repeatone != playForever) {
playForever = repeatone;
vgmstream_set_play_forever(stream, repeatone);
}
}
if (frame > totalFrames)