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

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
This commit is contained in:
cam900 2022-03-07 02:35:14 +09:00
commit fca4bdc1ee
10 changed files with 1022 additions and 8 deletions

View file

@ -34,6 +34,7 @@
#include "platform/ym2610bext.h"
#include "platform/ay.h"
#include "platform/ay8930.h"
#include "platform/opl.h"
#include "platform/tia.h"
#include "platform/saa.h"
#include "platform/amiga.h"
@ -211,6 +212,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
((DivPlatformOPLL*)dispatch)->setVRC7(sys==DIV_SYSTEM_VRC7);
((DivPlatformOPLL*)dispatch)->setProperDrums(sys==DIV_SYSTEM_OPLL_DRUMS);
break;
case DIV_SYSTEM_OPL3:
dispatch=new DivPlatformOPL;
break;
case DIV_SYSTEM_SAA1099: {
int saaCore=eng->getConfInt("saaCore",0);
if (saaCore<0 || saaCore>2) saaCore=0;