From d869c21f522d45c55a53faf45fb0274638eb3e09 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 26 Mar 2022 13:47:13 -0500 Subject: [PATCH] oops I forgot to commit! --- src/engine/platform/vic20.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/engine/platform/vic20.cpp b/src/engine/platform/vic20.cpp index 7c2890848..b640f780c 100644 --- a/src/engine/platform/vic20.cpp +++ b/src/engine/platform/vic20.cpp @@ -22,11 +22,9 @@ #include #define rWrite(a,v) {regPool[(a)]=(v)&0xff; vic_sound_machine_store(vic,a,(v)&0xff);} -#define SAMP_DIVIDER 4 -const int chipDividers[4]={ - 128, 64, 32, 64 -}; +#define CHIP_DIVIDER 32 +#define SAMP_DIVIDER 4 const char* regCheatSheetVIC[]={ "CH1_Pitch", "0A", @@ -95,7 +93,6 @@ void DivPlatformVIC20::writeOutVol(int ch) { void DivPlatformVIC20::tick() { for (int i=0; i<4; i++) { - int CHIP_DIVIDER=chipDividers[i]; chan[i].std.next(); if (chan[i].std.hadVol) { int env=chan[i].std.vol; @@ -124,9 +121,13 @@ void DivPlatformVIC20::tick() { } if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) { chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true); - printf("%d freq: %d\n",i,chan[i].freq); + if (i<3) { + chan[i].freq>>=(2-i); + } else { + chan[i].freq>>=1; + } if (chan[i].freq<1) chan[i].freq=1; - if (chan[i].freq>127) chan[i].freq=127; + if (chan[i].freq>127) chan[i].freq=0; if (isMuted[i]) chan[i].keyOn=false; if (chan[i].keyOn) { if (i<3) { @@ -152,7 +153,6 @@ void DivPlatformVIC20::tick() { } int DivPlatformVIC20::dispatch(DivCommand c) { - int CHIP_DIVIDER=chipDividers[c.chan]; switch (c.cmd) { case DIV_CMD_NOTE_ON: { DivInstrument* ins=parent->getIns(chan[c.chan].ins);