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

Merge branch 'master' into multicore

Browse source
This commit is contained in:
Eknous-P 2023-08-18 08:59:06 +04:00
parent 36e2444b11 f2dd169e3d
commit 12d7911d1a
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
*.sfd text

1
.gitignore vendored
View file

@ -27,3 +27,4 @@ extern/imgui_patched/examples/
src/asm/68k/amigatest/*.bin src/asm/68k/amigatest/*.bin
src/asm/68k/amigatest/player src/asm/68k/amigatest/player
res/binary_to_compressed_c res/binary_to_compressed_c
res/binary_to_compressed_c.exe

BIN
demos/opl/DASH.fur Normal file
View file

Binary file not shown.

2
src/engine/platform/gb.cpp
View file

@ -458,7 +458,7 @@ int DivPlatformGB::dispatch(DivCommand c) {
} }
chan[c.chan].envVol=chan[c.chan].outVol; chan[c.chan].envVol=chan[c.chan].outVol;
if (!chan[c.chan].keyOn) chan[c.chan].killIt=true; if (!chan[c.chan].keyOn && chan[c.chan].active) chan[c.chan].killIt=true;
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
} }
break; break;

8
src/engine/platform/genesisext.cpp
View file

@ -443,13 +443,15 @@ void DivPlatformGenesisExt::muteChannel(int ch, bool mute) {
DivPlatformGenesis::muteChannel(extChanOffs,IS_EXTCH_MUTED); DivPlatformGenesis::muteChannel(extChanOffs,IS_EXTCH_MUTED);
if (extMode) { if (extMode) {
int ordch=orderedOps[ch-2]; for (int i=0; i<4; i++) {
int ordch=orderedOps[i];
unsigned short baseAddr=chanOffs[2]|opOffs[ordch]; unsigned short baseAddr=chanOffs[2]|opOffs[ordch];
DivInstrumentFM::Operator op=chan[2].state.op[ordch]; DivInstrumentFM::Operator op=chan[2].state.op[ordch];
if (isOpMuted[ch-2] || !op.enable) { if (isOpMuted[i] || !op.enable) {
rWrite(baseAddr+0x40,127); rWrite(baseAddr+0x40,127);
} else { } else {
rWrite(baseAddr+0x40,127-VOL_SCALE_LOG_BROKEN(127-op.tl,opChan[ch-2].outVol&0x7f,127)); rWrite(baseAddr+0x40,127-VOL_SCALE_LOG_BROKEN(127-op.tl,opChan[i].outVol&0x7f,127));
}
} }
rWrite(chanOffs[2]+0xb4,(IS_EXTCH_MUTED?0:(opChan[ch-2].pan<<6))|(chan[2].state.fms&7)|((chan[2].state.ams&3)<<4)); rWrite(chanOffs[2]+0xb4,(IS_EXTCH_MUTED?0:(opChan[ch-2].pan<<6))|(chan[2].state.fms&7)|((chan[2].state.ams&3)<<4));

1
src/gui/about.cpp
View file

@ -136,6 +136,7 @@ const char* aboutLine[]={
"UserSniper", "UserSniper",
"Weeppiko", "Weeppiko",
"Xan", "Xan",
"YaIiya",
"Yuzu4K", "Yuzu4K",
"Zaxolotl", "Zaxolotl",
"ZoomTen (Zumi)", "ZoomTen (Zumi)",