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

prepare for issues #1554 and #1684

Browse source
This commit is contained in:
tildearrow 2024-01-31 15:07:48 -05:00
parent 26bf3c407a
commit 532f00a311
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/chipUtils.h
View file

@ -20,6 +20,7 @@
#ifndef _CHIP_UTILS_H #ifndef _CHIP_UTILS_H
#define _CHIP_UTILS_H #define _CHIP_UTILS_H
#include "defines.h"
#include "macroInt.h" #include "macroInt.h"
// custom clock limits // custom clock limits
@ -29,7 +30,7 @@
// common shared channel struct // common shared channel struct
template<typename T> struct SharedChannel { template<typename T> struct SharedChannel {
int freq, baseFreq, baseNoteOverride, pitch, pitch2, arpOff; int freq, baseFreq, baseNoteOverride, pitch, pitch2, arpOff;
int ins, note; int ins, note, sampleNote, sampleNoteDelta;
bool active, insChanged, freqChanged, fixedArp, keyOn, keyOff, portaPause, inPorta; bool active, insChanged, freqChanged, fixedArp, keyOn, keyOff, portaPause, inPorta;
T vol, outVol; T vol, outVol;
DivMacroInt std; DivMacroInt std;
@ -71,6 +72,8 @@ template<typename T> struct SharedChannel {
arpOff(0), arpOff(0),
ins(-1), ins(-1),
note(0), note(0),
sampleNote(DIV_NOTE_NULL),
sampleNoteDelta(0),
active(false), active(false),
insChanged(true), insChanged(true),
freqChanged(false), freqChanged(false),

1
src/engine/defines.h
View file

@ -36,5 +36,6 @@
// dispatch // dispatch
#define DIV_MAX_OUTPUTS 16 #define DIV_MAX_OUTPUTS 16
#define DIV_NOTE_NULL 0x7fffffff
#endif #endif

3
src/engine/dispatch.h
View file

@ -25,11 +25,10 @@
#include "../pch.h" #include "../pch.h"
#include "config.h" #include "config.h"
#include "chipUtils.h" #include "chipUtils.h"
#include "defines.h"
#define ONE_SEMITONE 2200 #define ONE_SEMITONE 2200
#define DIV_NOTE_NULL 0x7fffffff
#define addWrite(a,v) regWrites.push_back(DivRegWrite(a,v)); #define addWrite(a,v) regWrites.push_back(DivRegWrite(a,v));
// HOW TO ADD A NEW COMMAND: // HOW TO ADD A NEW COMMAND:

10
src/engine/platform/amiga.cpp
View file

@ -383,7 +383,7 @@ void DivPlatformAmiga::tick(bool sysTick) {
chan[i].handleArp(); chan[i].handleArp();
} else if (chan[i].std.arp.had) { } else if (chan[i].std.arp.had) {
// TODO: why the off mult? this may be a bug! // TODO: why the off mult? this may be a bug!
chan[i].baseFreq=round(off*NOTE_PERIODIC_NOROUND(parent->calcArp(chan[i].note,chan[i].std.arp.val))); chan[i].baseFreq=round(NOTE_PERIODIC_NOROUND(parent->calcArp(chan[i].note,chan[i].std.arp.val)));
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
if (chan[i].useWave && chan[i].std.wave.had) { if (chan[i].useWave && chan[i].std.wave.had) {
@ -580,7 +580,9 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
} else { } else {
if (c.value!=DIV_NOTE_NULL) { if (c.value!=DIV_NOTE_NULL) {
chan[c.chan].sample=ins->amiga.getSample(c.value); chan[c.chan].sample=ins->amiga.getSample(c.value);
chan[c.chan].sampleNote=c.value;
c.value=ins->amiga.getFreq(c.value); c.value=ins->amiga.getFreq(c.value);
chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
} }
chan[c.chan].useWave=false; chan[c.chan].useWave=false;
} }
@ -657,9 +659,7 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
chan[c.chan].updateWave=true; chan[c.chan].updateWave=true;
break; break;
case DIV_CMD_NOTE_PORTA: { case DIV_CMD_NOTE_PORTA: {
DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA); int destFreq=round(NOTE_PERIODIC_NOROUND(c.value2+chan[c.chan].sampleNoteDelta));
chan[c.chan].sample=ins->amiga.getSample(c.value2);
int destFreq=round(NOTE_PERIODIC_NOROUND(c.value2));
bool return2=false; bool return2=false;
if (destFreq>chan[c.chan].baseFreq) { if (destFreq>chan[c.chan].baseFreq) {
chan[c.chan].baseFreq+=c.value; chan[c.chan].baseFreq+=c.value;
@ -682,7 +682,7 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_LEGATO: { case DIV_CMD_LEGATO: {
chan[c.chan].baseFreq=round(NOTE_PERIODIC_NOROUND(c.value+((HACKY_LEGATO_MESS)?(chan[c.chan].std.arp.val):(0)))); chan[c.chan].baseFreq=round(NOTE_PERIODIC_NOROUND(c.value+chan[c.chan].sampleNoteDelta+((HACKY_LEGATO_MESS)?(chan[c.chan].std.arp.val):(0))));
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
break; break;