otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix song stopping too early

Browse source
This commit is contained in:
tildearrow 2022-10-22 03:46:39 -05:00
parent b073368b21
commit a8def55d56
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/engine/playback.cpp
View file

@ -844,7 +844,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
break;
case 0xff: // stop song
shallStop=true;
shallStopSched=true;
logV("scheduling stop");
break;
}
}
@ -1132,7 +1133,11 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
tempoAccum-=curSubSong->virtualTempoD;
if (--ticks<=0) {
ret=endOfSong;
if (endOfSong) {
if (shallStopSched) {
logV("acknowledging scheduled stop");
shallStop=true;
break;
} else if (endOfSong) {
if (song.loopModality!=2) {
playSub(true);
}
@ -1147,7 +1152,7 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
if (tempoAccum>1023) tempoAccum=1023;
}
// process stuff
for (int i=0; i<chans; i++) {
if (!shallStop) for (int i=0; i<chans; i++) {
if (chan[i].rowDelay>0) {
if (--chan[i].rowDelay==0) {
processRow(i,true);
@ -1291,6 +1296,7 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
sPreview.dir=false;
ret=true;
shallStop=false;
shallStopSched=false;
return ret;
}