etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPLL: small order change fix

This commit is contained in:
tildearrow 2022-03-01 01:00:33 -05:00
parent d9ae033f32
commit 2605e8670c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/platform/opll.cpp
View File

@ -358,6 +358,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
rWrite(0x05,(car.ar<<4)|(car.dr)); rWrite(0x05,(car.ar<<4)|(car.dr));
rWrite(0x06,(mod.sl<<4)|(mod.rr)); rWrite(0x06,(mod.sl<<4)|(mod.rr));
rWrite(0x07,(car.sl<<4)|(car.rr)); rWrite(0x07,(car.sl<<4)|(car.rr));
lastCustomMemory=c.chan;
} }
if (chan[c.chan].state.opllPreset==16) { // compatible drums mode if (chan[c.chan].state.opllPreset==16) { // compatible drums mode
if (c.chan>=6) { if (c.chan>=6) {
@ -564,7 +565,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
void DivPlatformOPLL::forceIns() { void DivPlatformOPLL::forceIns() {
for (int i=0; i<9; i++) { for (int i=0; i<9; i++) {
// update custom preset // update custom preset
if (chan[i].state.opllPreset==0) { if (chan[i].state.opllPreset==0 && i==lastCustomMemory) {
DivInstrumentFM::Operator& mod=chan[i].state.op[0]; DivInstrumentFM::Operator& mod=chan[i].state.op[0];
DivInstrumentFM::Operator& car=chan[i].state.op[1]; DivInstrumentFM::Operator& car=chan[i].state.op[1];
rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult)); rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult));
@ -645,6 +646,7 @@ void DivPlatformOPLL::reset() {
lastBusy=60; lastBusy=60;
drumState=0; drumState=0;
lastCustomMemory=-1;
drumVol[0]=0; drumVol[0]=0;
drumVol[1]=0; drumVol[1]=0;

2
src/engine/platform/opll.h
View File

@ -67,7 +67,7 @@ class DivPlatformOPLL: public DivDispatch {
}; };
std::queue<QueuedWrite> writes; std::queue<QueuedWrite> writes;
opll_t fm; opll_t fm;
int delay; int delay, lastCustomMemory;
unsigned char lastBusy; unsigned char lastBusy;
unsigned char drumState; unsigned char drumState;
unsigned char drumVol[5]; unsigned char drumVol[5];