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

fix retrigger implementation

Browse source 
no longer broken
This commit is contained in:
tildearrow 2022-01-19 00:01:34 -05:00
parent 1642f29df8
commit e87239f8ce
19 changed files with 105 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/engine/playback.cpp
View file

@ -468,6 +468,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
}
}
chan[i].retrigSpeed=0;
// effects
for (int j=0; j<song.pat[i].effectRows; j++) {
short effect=pat->data[whatRow][4+(j<<1)];
@ -566,9 +568,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
break;
case 0x0c: // retrigger
if (effectVal!=0) {
chan[i].rowDelay=effectVal; // this was +1 before. what happened?!
chan[i].delayOrder=whatOrder;
chan[i].delayRow=whatRow;
chan[i].retrigSpeed=effectVal;
chan[i].retrigTick=0;
}
break;
case 0xc0: case 0xc1: case 0xc2: case 0xc3: // set Hz
@ -797,6 +798,12 @@ bool DivEngine::nextTick(bool noAccum) {
processRow(i,true);
}
}
if (chan[i].retrigSpeed) {
if (--chan[i].retrigTick<0) {
chan[i].retrigTick=chan[i].retrigSpeed-1;
dispatchCmd(DivCommand(DIV_CMD_NOTE_ON,i,DIV_NOTE_NULL));
}
}
if (chan[i].volSpeed!=0) {
chan[i].volume=(chan[i].volume&0xff)|(dispatchCmd(DivCommand(DIV_CMD_GET_VOLUME,i))<<8);
chan[i].volume+=chan[i].volSpeed;