etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 00:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix volume macro again

Browse source
This commit is contained in:
scratchminer 2024-01-21 21:01:40 -05:00
parent 8f8ccdc272
commit bc3a12ef4a
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/engine/platform/powernoise.cpp
View file

@ -146,18 +146,29 @@ void DivPlatformPowerNoise::tick(bool sysTick) {
if (chan[i].std.vol.had) { if (chan[i].std.vol.had) {
chan[i].outVol=VOL_SCALE_LINEAR_BROKEN(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15); chan[i].outVol=VOL_SCALE_LINEAR_BROKEN(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
if (chan[i].outVol<0) chan[i].outVol=0;
}
if (NEW_ARP_STRAT) {
chan[i].handleArp();
} else if (chan[i].std.arp.had) {
if (!chan[i].inPorta) {
chan[i].baseFreq=NOTE_PERIODIC(parent->calcArp(chan[i].note,chan[i].std.arp.val));
}
chan[i].freqChanged=true;
} }
chan[i].handleArp();
if (chan[i].std.panL.had) { if (chan[i].std.panL.had) {
chan[i].pan&=0x0f; chan[i].pan&=0x0f;
chan[i].pan|=(chan[i].std.panL.val&15)<<4; chan[i].pan|=(chan[i].std.panL.val&15)<<4;
cWrite(i,0x06,volPan(chan[i].outVol, chan[i].pan));
} }
if (chan[i].std.panR.had) { if (chan[i].std.panR.had) {
chan[i].pan&=0xf0; chan[i].pan&=0xf0;
chan[i].pan|=chan[i].std.panR.val&15; chan[i].pan|=chan[i].std.panR.val&15;
cWrite(i,0x06,volPan(chan[i].outVol, chan[i].pan));
} }
if (chan[i].std.panL.had || chan[i].std.panR.had || chan[i].std.vol.had) {
cWrite(i,0x06,isMuted[i]?0:volPan(chan[i].outVol, chan[i].pan)); if(chan[i].std.vol.had || chan[i].std.panL.had || chan[i].std.panR.had) {
cWrite(i,0x06,volPan(chan[i].outVol, chan[i].pan));
} }
if (chan[i].std.pitch.had) { if (chan[i].std.pitch.had) {
if (chan[i].std.pitch.mode) { if (chan[i].std.pitch.mode) {
@ -312,7 +323,9 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) {
chan[c.chan].vol=c.value; chan[c.chan].vol=c.value;
if (!chan[c.chan].std.vol.has) { if (!chan[c.chan].std.vol.has) {
chan[c.chan].outVol=c.value; chan[c.chan].outVol=c.value;
cWrite(c.chan,0x06,isMuted[c.chan]?0:volPan(chan[c.chan].outVol, chan[c.chan].pan)); if (chan[c.chan].active) {
cWrite(c.chan,0x06,volPan(chan[c.chan].outVol, chan[c.chan].pan));
}
} }
} }
break; break;
@ -358,7 +371,7 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) {
} }
case DIV_CMD_PANNING: { case DIV_CMD_PANNING: {
chan[c.chan].pan=(c.value&0xf0)|(c.value2>>4); chan[c.chan].pan=(c.value&0xf0)|(c.value2>>4);
cWrite(c.chan,0x06,isMuted[c.chan]?0:volPan(chan[c.chan].outVol, chan[c.chan].pan)); cWrite(c.chan,0x06,volPan(chan[c.chan].outVol, chan[c.chan].pan));
break; break;
} }
case DIV_CMD_LEGATO: { case DIV_CMD_LEGATO: {
@ -410,15 +423,15 @@ int DivPlatformPowerNoise::dispatch(DivCommand c) {
} }
void DivPlatformPowerNoise::muteChannel(int ch, bool mute) { void DivPlatformPowerNoise::muteChannel(int ch, bool mute) {
isMuted[ch]=mute; if(mute) chan[ch].keyOff = true;
cWrite(ch,0x06,isMuted[ch]?0:volPan(chan[ch].outVol, chan[ch].pan)); else chan[ch].keyOn = true;
} }
void DivPlatformPowerNoise::forceIns() { void DivPlatformPowerNoise::forceIns() {
for (int i=0; i<6; i++) { for (int i=0; i<6; i++) {
chan[i].insChanged=true; chan[i].insChanged=true;
chan[i].freqChanged=true; chan[i].freqChanged=true;
cWrite(i,0x06,isMuted[i]?0:volPan(chan[i].outVol, chan[i].pan)); cWrite(i,0x06,volPan(chan[i].outVol, chan[i].pan));
} }
} }
@ -487,7 +500,7 @@ void DivPlatformPowerNoise::reset() {
rWrite(0,0x87); rWrite(0,0x87);
// set per-channel panning // set per-channel panning
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
cWrite(i,0x06,isMuted[i]?0:volPan(chan[i].outVol, chan[i].pan)); cWrite(i,0x06,volPan(chan[i].outVol, chan[i].pan));
} }
addWrite(0xffffffff, 0); addWrite(0xffffffff, 0);
} }
@ -534,7 +547,6 @@ int DivPlatformPowerNoise::init(DivEngine* p, int channels, int sugRate, const D
skipRegisterWrites=false; skipRegisterWrites=false;
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
isMuted[i]=false;
oscBuf[i]=new DivDispatchOscBuffer; oscBuf[i]=new DivDispatchOscBuffer;
} }
setFlags(flags); setFlags(flags);

1
src/engine/platform/powernoise.h
View file

@ -59,7 +59,6 @@ class DivPlatformPowerNoise: public DivDispatch {
Channel chan[4]; Channel chan[4];
DivDispatchOscBuffer* oscBuf[4]; DivDispatchOscBuffer* oscBuf[4];
bool isMuted[4];
unsigned char regPool[32]; unsigned char regPool[32];
FixedQueue<int16_t,64> queueLeft; FixedQueue<int16_t,64> queueLeft;