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

Fix panning

Browse source
This commit is contained in:
cam900 2022-03-07 03:06:01 +09:00
parent fca4bdc1ee
commit d0c32a56be
2 changed files with 42 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/engine/platform/x1_010.cpp
View file

@ -306,7 +306,7 @@ void DivPlatformX1_010::updateEnvelope(int ch) {
for (int i=0; i<128; i++) { for (int i=0; i<128; i++) {
if (wt->max<1 || wt->len<1) { if (wt->max<1 || wt->len<1) {
envFill(ch,i); envFill(ch,i);
} else if (stereo&&(chan[ch].env.flag.envHinv||chan[ch].env.flag.envSplit||chan[ch].env.flag.envVinv)) { // Stereo config } else if (chan[ch].env.flag.envHinv||chan[ch].env.flag.envSplit||chan[ch].env.flag.envVinv) { // Stereo config
int la = i, ra = i; int la = i, ra = i;
int lo, ro; int lo, ro;
if (chan[ch].env.flag.envHinv) { ra = 127-i; } // horizontal invert right envelope if (chan[ch].env.flag.envHinv) { ra = 127-i; } // horizontal invert right envelope
@ -386,29 +386,27 @@ void DivPlatformX1_010::tick() {
refreshControl(i); refreshControl(i);
} }
} }
if (stereo) { bool nextSplit=(chan[i].std.ex1&4);
bool nextSplit=(chan[i].std.ex1&4); if (nextSplit!=(chan[i].env.flag.envSplit)) {
if (nextSplit!=(chan[i].env.flag.envSplit)) { chan[i].env.flag.envSplit=nextSplit;
chan[i].env.flag.envSplit=nextSplit; if (!isMuted[i] && !chan[i].pcm) {
if (!isMuted[i] && !chan[i].pcm) { chan[i].envChanged=true;
chan[i].envChanged=true;
}
} }
bool nextHinv=(chan[i].std.ex1&8); }
if (nextHinv!=(chan[i].env.flag.envHinv)) { bool nextHinv=(chan[i].std.ex1&8);
chan[i].env.flag.envHinv=nextHinv; if (nextHinv!=(chan[i].env.flag.envHinv)) {
if (!isMuted[i] && !chan[i].pcm) { chan[i].env.flag.envHinv=nextHinv;
chan[i].envChanged=true; if (!isMuted[i] && !chan[i].pcm) {
} chan[i].envChanged=true;
} }
bool nextVinv=(chan[i].std.ex1&16); }
if (nextVinv!=(chan[i].env.flag.envVinv)) { bool nextVinv=(chan[i].std.ex1&16);
chan[i].env.flag.envVinv=nextVinv; if (nextVinv!=(chan[i].env.flag.envVinv)) {
if (!isMuted[i] && !chan[i].pcm) { chan[i].env.flag.envVinv=nextVinv;
chan[i].envChanged=true; if (!isMuted[i] && !chan[i].pcm) {
} chan[i].envChanged=true;
} }
} }
} }
if (chan[i].std.hadEx2) { if (chan[i].std.hadEx2) {
if (chan[i].env.shape!=chan[i].std.ex2) { if (chan[i].env.shape!=chan[i].std.ex2) {
@ -437,12 +435,8 @@ void DivPlatformX1_010::tick() {
} }
if (chan[i].envChanged) { if (chan[i].envChanged) {
if (!isMuted[i]) { if (!isMuted[i]) {
if (stereo) { chan[i].lvol=((chan[i].outVol&0xf)*((chan[i].pan>>4)&0xf))/15;
chan[i].lvol=((chan[i].outVol&0xf)*((chan[i].pan>>4)&0xf))/15; chan[i].rvol=((chan[i].outVol&0xf)*((chan[i].pan>>0)&0xf))/15;
chan[i].rvol=((chan[i].outVol&0xf)*((chan[i].pan>>0)&0xf))/15;
} else {
chan[i].lvol=chan[i].rvol=chan[i].outVol;
}
} }
updateEnvelope(i); updateEnvelope(i);
chan[i].envChanged=false; chan[i].envChanged=false;
@ -654,7 +648,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_PANNING: { case DIV_CMD_PANNING: {
if (stereo&&(chan[c.chan].pan!=c.value)) { if (chan[c.chan].pan!=c.value) {
chan[c.chan].pan=c.value; chan[c.chan].pan=c.value;
if (!isMuted[c.chan]) { if (!isMuted[c.chan]) {
chan[c.chan].envChanged=true; chan[c.chan].envChanged=true;
@ -700,29 +694,27 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
refreshControl(c.chan); refreshControl(c.chan);
} }
} }
if (stereo) { bool nextSplit=c.value&4;
bool nextSplit=c.value&4; if (nextSplit!=(chan[c.chan].env.flag.envSplit)) {
if (nextSplit!=(chan[c.chan].env.flag.envSplit)) { chan[c.chan].env.flag.envSplit=nextSplit;
chan[c.chan].env.flag.envSplit=nextSplit; if (!isMuted[c.chan] && !chan[c.chan].pcm) {
if (!isMuted[c.chan] && !chan[c.chan].pcm) { chan[c.chan].envChanged=true;
chan[c.chan].envChanged=true;
}
} }
bool nextHinv=c.value&8; }
if (nextHinv!=(chan[c.chan].env.flag.envHinv)) { bool nextHinv=c.value&8;
chan[c.chan].env.flag.envHinv=nextHinv; if (nextHinv!=(chan[c.chan].env.flag.envHinv)) {
if (!isMuted[c.chan] && !chan[c.chan].pcm) { chan[c.chan].env.flag.envHinv=nextHinv;
chan[c.chan].envChanged=true; if (!isMuted[c.chan] && !chan[c.chan].pcm) {
} chan[c.chan].envChanged=true;
} }
bool nextVinv=c.value&16; }
if (nextVinv!=(chan[c.chan].env.flag.envVinv)) { bool nextVinv=c.value&16;
chan[c.chan].env.flag.envVinv=nextVinv; if (nextVinv!=(chan[c.chan].env.flag.envVinv)) {
if (!isMuted[c.chan] && !chan[c.chan].pcm) { chan[c.chan].env.flag.envVinv=nextVinv;
chan[c.chan].envChanged=true; if (!isMuted[c.chan] && !chan[c.chan].pcm) {
} chan[c.chan].envChanged=true;
} }
} }
break; break;
} }
case DIV_CMD_X1_010_ENVELOPE_PERIOD: case DIV_CMD_X1_010_ENVELOPE_PERIOD:

2
src/engine/playback.cpp
View file

@ -260,6 +260,8 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe
case 0x17: // PCM enable case 0x17: // PCM enable
dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0))); dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
break; break;
default:
return false;
} }
break; break;
default: default: