fix OPNB emu core setting, fix chan osc for OPN ymfm

This commit is contained in:
LTVA1 2024-10-13 17:27:36 +03:00 committed by tildearrow
parent 9130f78720
commit 721c3b55b6
2 changed files with 7 additions and 7 deletions

View file

@ -379,9 +379,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
case DIV_SYSTEM_YM2610_CSM: case DIV_SYSTEM_YM2610_CSM:
dispatch=new DivPlatformYM2610Ext; dispatch=new DivPlatformYM2610Ext;
if (isRender) { if (isRender) {
((DivPlatformYM2610Ext*)dispatch)->setCombo(eng->getConfInt("opnCoreRender",1)==1); ((DivPlatformYM2610Ext*)dispatch)->setCombo(eng->getConfInt("opnbCoreRender",1));
} else { } else {
((DivPlatformYM2610Ext*)dispatch)->setCombo(eng->getConfInt("opnCore",1)==1); ((DivPlatformYM2610Ext*)dispatch)->setCombo(eng->getConfInt("opnbCore",1));
} }
((DivPlatformYM2610Ext*)dispatch)->setCSM(1); ((DivPlatformYM2610Ext*)dispatch)->setCSM(1);
break; break;
@ -405,9 +405,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
case DIV_SYSTEM_YM2610B_CSM: case DIV_SYSTEM_YM2610B_CSM:
dispatch=new DivPlatformYM2610BExt; dispatch=new DivPlatformYM2610BExt;
if (isRender) { if (isRender) {
((DivPlatformYM2610BExt*)dispatch)->setCombo(eng->getConfInt("opnCoreRender",1)==1); ((DivPlatformYM2610BExt*)dispatch)->setCombo(eng->getConfInt("opnbCoreRender",1));
} else { } else {
((DivPlatformYM2610BExt*)dispatch)->setCombo(eng->getConfInt("opnCore",1)==1); ((DivPlatformYM2610BExt*)dispatch)->setCombo(eng->getConfInt("opnbCore",1));
} }
((DivPlatformYM2610BExt*)dispatch)->setCSM(1); ((DivPlatformYM2610BExt*)dispatch)->setCSM(1);
break; break;
@ -456,9 +456,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
case DIV_SYSTEM_YM2203_CSM: case DIV_SYSTEM_YM2203_CSM:
dispatch=new DivPlatformYM2203Ext; dispatch=new DivPlatformYM2203Ext;
if (isRender) { if (isRender) {
((DivPlatformYM2203Ext*)dispatch)->setCombo(eng->getConfInt("opnCoreRender",1)==1); ((DivPlatformYM2203Ext*)dispatch)->setCombo(eng->getConfInt("opn1CoreRender",1));
} else { } else {
((DivPlatformYM2203Ext*)dispatch)->setCombo(eng->getConfInt("opnCore",1)==1); ((DivPlatformYM2203Ext*)dispatch)->setCombo(eng->getConfInt("opn1Core",1));
} }
((DivPlatformYM2203Ext*)dispatch)->setCSM(1); ((DivPlatformYM2203Ext*)dispatch)->setCSM(1);
break; break;

View file

@ -291,7 +291,7 @@ void DivPlatformYM2203::acquire_ymfm(short** buf, size_t len) {
} }
for (int i=(3+isCSM); i<(6+isCSM); i++) { for (int i=(3+isCSM); i<(6+isCSM); i++) {
oscBuf[i]->data[oscBuf[i]->needle++]=fmout.data[i-2+isCSM]<<1; oscBuf[i]->data[oscBuf[i]->needle++]=fmout.data[i-(2+isCSM)]<<1;
} }
} }
} }