etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-15 17:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly case PCM channel

Browse source
This commit is contained in:
Natt Akuma 2022-03-08 15:44:14 +07:00
parent a86a7f766b
commit e05052d9d7
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/engine/platform/vera.cpp
View file

@ -161,21 +161,11 @@ int DivPlatformVERA::calcNoteFreq(int ch, int note) {
} }
void DivPlatformVERA::tick() { void DivPlatformVERA::tick() {
for (int i=0; i<17; i++) { for (int i=0; i<16; i++) {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) { if (chan[i].std.hadVol) {
if (i<16) { chan[i].outVol=MAX(chan[i].vol+chan[i].std.vol-63,0);
chan[i].outVol=MAX(chan[i].vol+chan[i].std.vol-63,0); rWriteLo(i,2,isMuted[i]?0:(chan[i].outVol&63));
rWriteLo(i,2,isMuted[i]?0:(chan[i].outVol&63));
} else {
// NB this is currently assuming Amiga instrument type with a 0-64
// (inclusive) volume range. This envelope is then scaled and added to
// the channel volume. Is this a better way to handle this instead of
// making another identical Amiga instrument type but with a 0-15
// volume range?
chan[16].outVol=MAX(chan[16].vol+MIN(chan[16].std.vol/4,15)-15,0);
rWriteFIFOVol(isMuted[16]?0:(chan[16].outVol&15));
}
} }
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (!chan[i].inPorta) { if (!chan[i].inPorta) {
@ -192,28 +182,25 @@ void DivPlatformVERA::tick() {
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
} }
if (chan[i].std.hadDuty && i<16) { if (chan[i].std.hadDuty) {
rWriteLo(i,3,chan[i].std.duty); rWriteLo(i,3,chan[i].std.duty);
} }
if (chan[i].std.hadWave && i<16) { if (chan[i].std.hadWave) {
rWriteHi(i,3,chan[i].std.wave); rWriteHi(i,3,chan[i].std.wave);
} }
if (chan[i].freqChanged) { if (chan[i].freqChanged) {
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,8); chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,8);
if (i<16) { if (chan[i].freq>65535) chan[i].freq=65535;
if (chan[i].freq>65535) chan[i].freq=65535; rWrite(i,0,chan[i].freq&0xff);
rWrite(i,0,chan[i].freq&0xff); rWrite(i,1,(chan[i].freq>>8)&0xff);
rWrite(i,1,(chan[i].freq>>8)&0xff);
} else {
if (chan[i].freq>128) chan[i].freq=128;
rWrite(16,1,chan[i].freq&0xff);
}
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
} }
// PCM // PCM
chan[16].std.next(); chan[16].std.next();
if (chan[16].std.hadVol) { if (chan[16].std.hadVol) {
chan[16].outVol=MAX(chan[16].vol+MIN(chan[16].std.vol/4,15)-15,0);
rWriteFIFOVol(isMuted[16]?0:(chan[16].outVol&15));
} }
if (chan[16].std.hadArp) { if (chan[16].std.hadArp) {
if (!chan[16].inPorta) { if (!chan[16].inPorta) {
@ -230,6 +217,12 @@ void DivPlatformVERA::tick() {
chan[16].freqChanged=true; chan[16].freqChanged=true;
} }
} }
if (chan[16].freqChanged) {
chan[16].freq=parent->calcFreq(chan[16].baseFreq,chan[16].pitch,false,8);
if (chan[16].freq>128) chan[16].freq=128;
rWrite(16,1,chan[16].freq&0xff);
chan[16].freqChanged=false;
}
} }
int DivPlatformVERA::dispatch(DivCommand c) { int DivPlatformVERA::dispatch(DivCommand c) {