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

Remove unnecessary value

Browse source
This commit is contained in:
cam900 2023-03-06 12:21:57 +09:00
parent c3e6163794
commit 34131e52d5
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ void DivPlatformPV1000::tick(bool sysTick) {
if (chan[i].std.vol.had) { if (chan[i].std.vol.had) {
chan[i].outVol=VOL_SCALE_LINEAR(chan[i].std.vol.val,chan[i].vol,1); chan[i].outVol=VOL_SCALE_LINEAR(chan[i].std.vol.val,chan[i].vol,1);
if (chan[i].outVol<0) chan[i].outVol=0; if (chan[i].outVol<0) chan[i].outVol=0;
chan[i].writeVol=true; chan[i].freqChanged=true;
} }
if (NEW_ARP_STRAT) { if (NEW_ARP_STRAT) {
chan[i].handleArp(); chan[i].handleArp();
@ -90,12 +90,6 @@ void DivPlatformPV1000::tick(bool sysTick) {
chan[i].freqChanged=false; chan[i].freqChanged=false;
} }
} }
for (int i=0; i<3; i++) {
if (chan[i].writeVol) {
rWrite(i,(isMuted[i] || (chan[i].outVol<=0)) ? 0 : chan[i].freq);
chan[i].writeVol=false;
}
}
} }
int DivPlatformPV1000::dispatch(DivCommand c) { int DivPlatformPV1000::dispatch(DivCommand c) {
@ -108,7 +102,6 @@ int DivPlatformPV1000::dispatch(DivCommand c) {
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
} }
chan[c.chan].active=true; chan[c.chan].active=true;
chan[c.chan].writeVol=true;
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;
chan[c.chan].macroInit(ins); chan[c.chan].macroInit(ins);
break; break;
@ -134,7 +127,7 @@ int DivPlatformPV1000::dispatch(DivCommand c) {
chan[c.chan].outVol=c.value; chan[c.chan].outVol=c.value;
} }
if (chan[c.chan].active) { if (chan[c.chan].active) {
chan[c.chan].writeVol=true; chan[c.chan].freqChanged=true;
} }
} }
break; break;
@ -204,7 +197,7 @@ void DivPlatformPV1000::muteChannel(int ch, bool mute) {
chan[ch].keyOff=true; chan[ch].keyOff=true;
} else if (chan[ch].active) { } else if (chan[ch].active) {
chan[ch].keyOn=true; chan[ch].keyOn=true;
chan[ch].writeVol=true; chan[ch].freqChanged=true;
} }
} }

4
src/engine/platform/pv1000.h
View file

@ -26,10 +26,8 @@
class DivPlatformPV1000: public DivDispatch { class DivPlatformPV1000: public DivDispatch {
struct Channel: public SharedChannel<int> { struct Channel: public SharedChannel<int> {
bool writeVol;
Channel(): Channel():
SharedChannel<int>(1), SharedChannel<int>(1) {}
writeVol(false) {}
}; };
Channel chan[3]; Channel chan[3];
DivDispatchOscBuffer* oscBuf[3]; DivDispatchOscBuffer* oscBuf[3];

1
src/gui/debug.cpp
View file

@ -1081,7 +1081,6 @@ void putDispatchChan(void* data, int chanNum, int type) {
ImGui::Text("> PV1000"); ImGui::Text("> PV1000");
COMMON_CHAN_DEBUG; COMMON_CHAN_DEBUG;
COMMON_CHAN_DEBUG_BOOL; COMMON_CHAN_DEBUG_BOOL;
ImGui::TextColored(ch->writeVol?colorOn:colorOff,">> WriteVol");
break; break;
} }
default: default: