Merge branch 'master' of https://github.com/tildearrow/furnace into ay_divider

* 'master' of https://github.com/tildearrow/furnace:
  GUI: macro UI refactor, part 2
  Masochism Volatile Compiler
  GUI: is the macro UI back yet
  OPL: fix 4-op muting (I think)
  GUI: macro UI refactor, part 1 - PLEASE READ
  GUI: remove classic macro view
  Fix more MSVC warnings
This commit is contained in:
cam900 2022-05-07 23:04:01 +09:00
commit 9df2500195
5 changed files with 331 additions and 649 deletions

View file

@ -564,7 +564,7 @@ int DivPlatformOPL::toFreq(int freq) {
void DivPlatformOPL::muteChannel(int ch, bool mute) {
isMuted[ch]=mute;
if (ch<melodicChans) {
if (oplType<3 && ch<melodicChans) {
fm.channel[outChanMap[ch]].muted=mute;
}
int ops=(slots[3][ch]!=255 && chan[ch].state.ops==4 && oplType==3)?4:2;
@ -1246,7 +1246,7 @@ void DivPlatformOPL::reset() {
chan[i].outVol=0x3f;
}
for (int i=0; i<melodicChans; i++) {
if (oplType<3) for (int i=0; i<melodicChans; i++) {
fm.channel[outChanMap[i]].muted=isMuted[i];
}