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

QuadTone: Fix per-chan osc rates

Browse source
This commit is contained in:
Natt Akuma 2024-02-03 06:34:58 +07:00
parent 1200e76469
commit d3e53772fc
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine/platform/zxbeeperquadtone.cpp
View file

@ -50,13 +50,13 @@ void DivPlatformZXBeeperQuadTone::acquire(short** buf, size_t len) {
} }
if (sampleActive) { if (sampleActive) {
buf[0][h]=chan[4].out?32767:0; buf[0][h]=chan[4].out?32767:0;
if ((outputClock&3)==0) { if (outputClock==0) {
oscBuf[0]->data[oscBuf[0]->needle++]=0; oscBuf[0]->data[oscBuf[0]->needle++]=0;
oscBuf[1]->data[oscBuf[1]->needle++]=0; oscBuf[1]->data[oscBuf[1]->needle++]=0;
oscBuf[2]->data[oscBuf[2]->needle++]=0; oscBuf[2]->data[oscBuf[2]->needle++]=0;
oscBuf[3]->data[oscBuf[3]->needle++]=0; oscBuf[3]->data[oscBuf[3]->needle++]=0;
oscBuf[4]->data[oscBuf[4]->needle++]=buf[0][h];
} }
oscBuf[4]->data[oscBuf[4]->needle++]=buf[0][h];
} else { } else {
int ch=outputClock/2; int ch=outputClock/2;
int b=ch*4; int b=ch*4;
@ -65,18 +65,15 @@ void DivPlatformZXBeeperQuadTone::acquire(short** buf, size_t len) {
short oscOut; short oscOut;
chan[ch].sPosition+=(regPool[1+b]<<8)|regPool[0+b]; chan[ch].sPosition+=(regPool[1+b]<<8)|regPool[0+b];
chan[ch].out=regPool[3+b]+((((chan[ch].sPosition>>8)&0xff)<regPool[2+b])?1:0); chan[ch].out=regPool[3+b]+((((chan[ch].sPosition>>8)&0xff)<regPool[2+b])?1:0);
if ((chan[ch].out&0x18)==0x18) { if (isMuted[ch] || ((chan[ch].out&0x18)==0)) {
oscOut=32767;
} else if ((chan[ch].out&0x18)==0) {
oscOut=0; oscOut=0;
} else if ((chan[ch].out&0x18)==0x18) {
oscOut=32767;
} else { } else {
oscOut=16383; oscOut=16383;
} }
oscBuf[ch]->data[oscBuf[ch]->needle++]=oscOut; oscBuf[ch]->data[oscBuf[ch]->needle++]=oscOut;
} }
if ((outputClock&3)==0) {
oscBuf[4]->data[oscBuf[4]->needle++]=0;
}
if (!isMuted[ch]) o=chan[ch].out&0x10; if (!isMuted[ch]) o=chan[ch].out&0x10;
if (noHiss) { if (noHiss) {
deHisser[outputClock]=o; deHisser[outputClock]=o;
@ -88,6 +85,7 @@ void DivPlatformZXBeeperQuadTone::acquire(short** buf, size_t len) {
buf[0][h]=o?32767:0; buf[0][h]=o?32767:0;
} }
chan[ch].out<<=1; chan[ch].out<<=1;
oscBuf[4]->data[oscBuf[4]->needle++]=0;
} }
outputClock=(outputClock+1)&7; outputClock=(outputClock+1)&7;
} }
@ -387,9 +385,10 @@ void DivPlatformZXBeeperQuadTone::setFlags(const DivConfig& flags) {
CHECK_CUSTOM_CLOCK; CHECK_CUSTOM_CLOCK;
rate=chipClock/40; rate=chipClock/40;
noHiss=flags.getBool("noHiss",false); noHiss=flags.getBool("noHiss",false);
for (int i=0; i<5; i++) { for (int i=0; i<4; i++) {
oscBuf[i]->rate=rate/4; oscBuf[i]->rate=rate/8;
} }
oscBuf[4]->rate=rate;
} }
void DivPlatformZXBeeperQuadTone::poke(unsigned int addr, unsigned short val) { void DivPlatformZXBeeperQuadTone::poke(unsigned int addr, unsigned short val) {