etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-12-31 20:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

SMS: possibly fix noise pitch issue

Browse source 
hoping this causes no regressions. fixes #56
This commit is contained in:
tildearrow 2022-01-30 17:10:15 -05:00
parent bf9eb8b0a4
commit 237ad1f517
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/platform/sms.cpp
View file

@ -26,13 +26,16 @@ void DivPlatformSMS::tick() {
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
chan[i].baseFreq=NOTE_PERIODIC(chan[i].std.arp); chan[i].baseFreq=NOTE_PERIODIC(chan[i].std.arp);
chan[i].actualNote=chan[i].std.arp;
} else { } else {
chan[i].baseFreq=NOTE_PERIODIC(chan[i].note+chan[i].std.arp); chan[i].baseFreq=NOTE_PERIODIC(chan[i].note+chan[i].std.arp);
chan[i].actualNote=chan[i].note+chan[i].std.arp;
} }
chan[i].freqChanged=true; chan[i].freqChanged=true;
} else { } else {
if (chan[i].std.arpMode && chan[i].std.finishedArp) { if (chan[i].std.arpMode && chan[i].std.finishedArp) {
chan[i].baseFreq=NOTE_PERIODIC(chan[i].note); chan[i].baseFreq=NOTE_PERIODIC(chan[i].note);
chan[i].actualNote=chan[i].note;
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
} }
@ -48,9 +51,13 @@ void DivPlatformSMS::tick() {
if (chan[i].freqChanged) { if (chan[i].freqChanged) {
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true); chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true);
if (chan[i].freq>1023) chan[i].freq=1023; if (chan[i].freq>1023) chan[i].freq=1023;
if (chan[i].note>0x5d) chan[i].freq=0x01; if (chan[i].actualNote>0x5d) chan[i].freq=0x01;
rWrite(0x80|i<<5|(chan[i].freq&15)); rWrite(0x80|i<<5|(chan[i].freq&15));
rWrite(chan[i].freq>>4); rWrite(chan[i].freq>>4);
if (i==2 && snNoiseMode&2) {
chan[3].baseFreq=chan[2].baseFreq;
chan[3].actualNote=chan[2].actualNote;
}
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
} }
@ -59,7 +66,7 @@ void DivPlatformSMS::tick() {
// seems arbitrary huh? // seems arbitrary huh?
chan[3].freq=parent->calcFreq(chan[3].baseFreq,chan[3].pitch-1-(isRealSN?127:0),true); chan[3].freq=parent->calcFreq(chan[3].baseFreq,chan[3].pitch-1-(isRealSN?127:0),true);
if (chan[3].freq>1023) chan[3].freq=1023; if (chan[3].freq>1023) chan[3].freq=1023;
if (chan[3].note>0x5d) chan[3].freq=0x01; if (chan[3].actualNote>0x5d) chan[3].freq=0x01;
chan[3].freqChanged=false; chan[3].freqChanged=false;
if (snNoiseMode&2) { // take period from channel 3 if (snNoiseMode&2) { // take period from channel 3
if (snNoiseMode&1) { if (snNoiseMode&1) {
@ -96,6 +103,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
chan[c.chan].baseFreq=NOTE_PERIODIC(c.value); chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
chan[c.chan].actualNote=c.value;
} }
chan[c.chan].active=true; chan[c.chan].active=true;
rWrite(0x90|c.chan<<5|(isMuted[c.chan]?15:(15-(chan[c.chan].vol&15)))); rWrite(0x90|c.chan<<5|(isMuted[c.chan]?15:(15-(chan[c.chan].vol&15))));
@ -157,6 +165,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
chan[c.chan].baseFreq=NOTE_PERIODIC(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp):(0))); chan[c.chan].baseFreq=NOTE_PERIODIC(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp):(0)));
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
chan[c.chan].actualNote=c.value;
break; break;
case DIV_CMD_PRE_PORTA: case DIV_CMD_PRE_PORTA:
chan[c.chan].std.init(parent->getIns(chan[c.chan].ins)); chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));

3
src/engine/platform/sms.h
View file

@ -7,7 +7,7 @@
class DivPlatformSMS: public DivDispatch { class DivPlatformSMS: public DivDispatch {
struct Channel { struct Channel {
int freq, baseFreq, pitch, note; int freq, baseFreq, pitch, note, actualNote;
unsigned char ins; unsigned char ins;
bool active, insChanged, freqChanged, keyOn, keyOff; bool active, insChanged, freqChanged, keyOn, keyOff;
signed char vol, outVol; signed char vol, outVol;
@ -17,6 +17,7 @@ class DivPlatformSMS: public DivDispatch {
baseFreq(0), baseFreq(0),
pitch(0), pitch(0),
note(0), note(0),
actualNote(0),
ins(-1), ins(-1),
active(false), active(false),
insChanged(true), insChanged(true),