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

slide accuracy fixes

Browse source
This commit is contained in:
tildearrow 2022-01-19 01:27:32 -05:00
parent e87239f8ce
commit f98662d329
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/engine.h
View file

@ -38,7 +38,7 @@ struct DivChannelState {
int vibratoDepth, vibratoRate, vibratoPos, vibratoDir, vibratoFine; int vibratoDepth, vibratoRate, vibratoPos, vibratoDir, vibratoFine;
int tremoloDepth, tremoloRate, tremoloPos; int tremoloDepth, tremoloRate, tremoloPos;
unsigned char arp, arpStage, arpTicks; unsigned char arp, arpStage, arpTicks;
bool doNote, legato, portaStop, keyOn, nowYouCanStop, stopOnOff, arpYield, delayLocked, inPorta; bool doNote, legato, portaStop, keyOn, nowYouCanStop, stopOnOff, arpYield, delayLocked, inPorta, scheduledSlideReset;
DivChannelState(): DivChannelState():
note(-1), note(-1),
@ -74,7 +74,8 @@ struct DivChannelState {
stopOnOff(false), stopOnOff(false),
arpYield(false), arpYield(false),
delayLocked(false), delayLocked(false),
inPorta(false) {} inPorta(false),
scheduledSlideReset(false) {}
}; };
struct DivNoteEvent { struct DivNoteEvent {

2
src/engine/platform/genesis.cpp
View file

@ -299,10 +299,8 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_SAMPLE_MODE: { case DIV_CMD_SAMPLE_MODE: {
if (c.chan==5) {
dacMode=c.value; dacMode=c.value;
rWrite(0x2b,c.value<<7); rWrite(0x2b,c.value<<7);
}
break; break;
} }
case DIV_CMD_SAMPLE_BANK: case DIV_CMD_SAMPLE_BANK:

25
src/engine/playback.cpp
View file

@ -445,6 +445,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i+1].portaSpeed=-1; chan[i+1].portaSpeed=-1;
} }
} }
chan[i].scheduledSlideReset=true;
dispatchCmd(DivCommand(DIV_CMD_NOTE_OFF,i)); dispatchCmd(DivCommand(DIV_CMD_NOTE_OFF,i));
} else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) { } else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
chan[i].oldNote=chan[i].note; chan[i].oldNote=chan[i].note;
@ -511,6 +512,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i].portaStop=true; chan[i].portaStop=true;
chan[i].nowYouCanStop=false; chan[i].nowYouCanStop=false;
chan[i].stopOnOff=false; chan[i].stopOnOff=false;
chan[i].scheduledSlideReset=false;
chan[i].inPorta=false;
} }
break; break;
case 0x02: // ramp down case 0x02: // ramp down
@ -524,6 +527,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i].portaStop=true; chan[i].portaStop=true;
chan[i].nowYouCanStop=false; chan[i].nowYouCanStop=false;
chan[i].stopOnOff=false; chan[i].stopOnOff=false;
chan[i].scheduledSlideReset=false;
chan[i].inPorta=false;
} }
break; break;
case 0x03: // portamento case 0x03: // portamento
@ -544,6 +549,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i].portaStop=true; chan[i].portaStop=true;
if (chan[i].keyOn) chan[i].doNote=false; if (chan[i].keyOn) chan[i].doNote=false;
chan[i].stopOnOff=true; chan[i].stopOnOff=true;
chan[i].scheduledSlideReset=false;
dispatchCmd(DivCommand(DIV_CMD_PRE_PORTA,i,true)); dispatchCmd(DivCommand(DIV_CMD_PRE_PORTA,i,true));
} }
break; break;
@ -590,6 +596,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i].portaStop=true; chan[i].portaStop=true;
chan[i].nowYouCanStop=false; chan[i].nowYouCanStop=false;
chan[i].stopOnOff=true; chan[i].stopOnOff=true;
chan[i].scheduledSlideReset=false;
chan[i].inPorta=false;
break; break;
case 0xe2: // portamento down case 0xe2: // portamento down
chan[i].portaNote=chan[i].note-(effectVal&15); chan[i].portaNote=chan[i].note-(effectVal&15);
@ -597,6 +605,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
chan[i].portaStop=true; chan[i].portaStop=true;
chan[i].nowYouCanStop=false; chan[i].nowYouCanStop=false;
chan[i].stopOnOff=true; chan[i].stopOnOff=true;
chan[i].scheduledSlideReset=false;
chan[i].inPorta=false;
break; break;
case 0xe3: // vibrato direction case 0xe3: // vibrato direction
chan[i].vibratoDir=effectVal; chan[i].vibratoDir=effectVal;
@ -642,16 +652,20 @@ void DivEngine::processRow(int i, bool afterDelay) {
if (chan[i].legato) { if (chan[i].legato) {
dispatchCmd(DivCommand(DIV_CMD_LEGATO,i,chan[i].note)); dispatchCmd(DivCommand(DIV_CMD_LEGATO,i,chan[i].note));
} else { } else {
if (chan[i].inPorta && chan[i].keyOn) {
chan[i].portaNote=chan[i].note;
} else {
printf("TURNING A NOTE ON\n");
dispatchCmd(DivCommand(DIV_CMD_NOTE_ON,i,chan[i].note,chan[i].volume>>8)); dispatchCmd(DivCommand(DIV_CMD_NOTE_ON,i,chan[i].note,chan[i].volume>>8));
} }
}
chan[i].doNote=false; chan[i].doNote=false;
/* if (!chan[i].keyOn && chan[i].scheduledSlideReset) {
if (!chan[i].keyOn) { printf("RESET PORTA\n");
if (chan[i].portaStop && chan[i].nowYouCanStop) {
chan[i].portaNote=-1; chan[i].portaNote=-1;
chan[i].portaSpeed=-1; chan[i].portaSpeed=-1;
chan[i].scheduledSlideReset=false;
} }
}*/
if (!chan[i].keyOn && chan[i].volume>chan[i].volMax) { if (!chan[i].keyOn && chan[i].volume>chan[i].volMax) {
chan[i].volume=chan[i].volMax; chan[i].volume=chan[i].volMax;
dispatchCmd(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8)); dispatchCmd(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8));
@ -835,7 +849,8 @@ bool DivEngine::nextTick(bool noAccum) {
} }
} }
if (chan[i].portaSpeed>0) { // TODO: RE-ENABLE IF BROKE YET AGAIN!
if (/*chan[i].keyOn && */chan[i].portaSpeed>0) {
if (dispatchCmd(DivCommand(DIV_CMD_NOTE_PORTA,i,chan[i].portaSpeed,chan[i].portaNote))==2 && chan[i].portaStop) { if (dispatchCmd(DivCommand(DIV_CMD_NOTE_PORTA,i,chan[i].portaSpeed,chan[i].portaNote))==2 && chan[i].portaStop) {
chan[i].portaSpeed=0; chan[i].portaSpeed=0;
chan[i].oldNote=chan[i].note; chan[i].oldNote=chan[i].note;