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

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

Browse source
This commit is contained in:
cam900 2022-09-30 20:01:21 +09:00
commit 987cc113b4
122 changed files with 2360 additions and 1001 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/engine/vgmOps.cpp
View file

@ -979,7 +979,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
if (!hasSN) {
hasSN=disCont[i].dispatch->chipClock;
willExport[i]=true;
switch ((song.systemFlagsOld[i]>>2)&3) {
switch (song.systemFlags[i].getInt("chipType",0)) {
case 1: // real SN
snNoiseConfig=3;
snNoiseSize=15;
@ -1094,11 +1094,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
ayConfig=0x03;
hasClockDivider=true;
} else {
switch ((song.systemFlagsOld[i]>>4)&3) {
default:
case 0: // AY8910
ayConfig=0x00;
break;
switch (song.systemFlags[i].getInt("chipType",0)) {
case 1: // YM2149
ayConfig=0x10;
hasClockDivider=true;
@ -1111,12 +1107,15 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
case 3: // AY8914
ayConfig=0x04;
break;
default: // AY8910
ayConfig=0x00;
break;
}
}
if (hasClockDivider && ((song.systemFlagsOld[i]>>7)&1)) {
if (hasClockDivider && song.systemFlags[i].getBool("halfClock",false)) {
ayFlags|=0x10;
}
if (hasStereo && ((song.systemFlagsOld[i]>>6)&1)) {
if (hasStereo && song.systemFlags[i].getBool("stereo",false)) {
ayFlags|=0x80;
}
willExport[i]=true;
@ -1358,7 +1357,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
// chips even though the only difference is the output resolution
// these system types are currently handled by reusing isSecond flag
// also this system is not dual-able
if ((song.systemFlagsOld[i]>>4)==1) {
if (song.systemFlags[i].getInt("chipType",0)==1) {
if (!hasRFC1) {
hasRFC1=disCont[i].dispatch->chipClock;
isSecond[i]=true;