From ca89b5beb8093df1dfb0558e8f82dcefda7a60e1 Mon Sep 17 00:00:00 2001 From: freq-mod <32672779+freq-mod@users.noreply.github.com> Date: Sun, 9 Mar 2025 13:26:33 +0100 Subject: [PATCH] Add files via upload --- src/engine/dispatchContainer.cpp | 5 ----- src/engine/platform/bubsyswsg.cpp | 26 -------------------------- src/engine/platform/bubsyswsg.h | 3 +-- src/gui/gui.h | 8 -------- src/gui/settings.cpp | 16 ---------------- 5 files changed, 1 insertion(+), 57 deletions(-) diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp index 7811e4b37..e8d79b1d3 100644 --- a/src/engine/dispatchContainer.cpp +++ b/src/engine/dispatchContainer.cpp @@ -632,11 +632,6 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do break; case DIV_SYSTEM_BUBSYS_WSG: dispatch=new DivPlatformBubSysWSG; - if (isRender) { - ((DivPlatformBubSysWSG*)dispatch)->setCoreQuality(eng->getConfInt("bubsysQualityRender",3)); - } else { - ((DivPlatformBubSysWSG*)dispatch)->setCoreQuality(eng->getConfInt("bubsysQuality",3)); - } break; case DIV_SYSTEM_N163: dispatch=new DivPlatformN163; diff --git a/src/engine/platform/bubsyswsg.cpp b/src/engine/platform/bubsyswsg.cpp index 3f9714950..5b615dbba 100644 --- a/src/engine/platform/bubsyswsg.cpp +++ b/src/engine/platform/bubsyswsg.cpp @@ -362,32 +362,6 @@ void DivPlatformBubSysWSG::poke(std::vector& wlist) { for (DivRegWrite& i: wlist) rWrite(i.addr,i.val); } -void DivPlatformBubSysWSG::setCoreQuality(unsigned char q) { - switch (q) { - case 0: - coreQuality=64; - break; - case 1: - coreQuality=32; - break; - case 2: - coreQuality=16; - break; - case 3: - coreQuality=8; - break; - case 4: - coreQuality=4; - break; - case 5: - coreQuality=1; - break; - default: - coreQuality=8; - break; - } -} - int DivPlatformBubSysWSG::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { parent=p; dumpWrites=false; diff --git a/src/engine/platform/bubsyswsg.h b/src/engine/platform/bubsyswsg.h index 31c1457f5..9b87b3b7f 100644 --- a/src/engine/platform/bubsyswsg.h +++ b/src/engine/platform/bubsyswsg.h @@ -38,7 +38,7 @@ class DivPlatformBubSysWSG: public DivDispatch { bool isMuted[2]; unsigned char writeOscBuf; - int coreQuality, lastOut; + int lastOut; k005289_core k005289; unsigned short regPool[4]; void updateWave(int ch); @@ -66,7 +66,6 @@ class DivPlatformBubSysWSG: public DivDispatch { void poke(unsigned int addr, unsigned short val); void poke(std::vector& wlist); const char** getRegisterSheet(); - void setCoreQuality(unsigned char q); int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags); void quit(); ~DivPlatformBubSysWSG(); diff --git a/src/gui/gui.h b/src/gui/gui.h index e488c91e1..dfbb79dc1 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1795,12 +1795,10 @@ class FurnaceGUI { int esfmCore; int opllCore; int ayCore; - int bubsysQuality; int dsidQuality; int gbQuality; int pnQuality; int saaQuality; - int smQuality; int arcadeCoreRender; int ym2612CoreRender; int snCoreRender; @@ -1817,12 +1815,10 @@ class FurnaceGUI { int esfmCoreRender; int opllCoreRender; int ayCoreRender; - int bubsysQualityRender; int dsidQualityRender; int gbQualityRender; int pnQualityRender; int saaQualityRender; - int smQualityRender; int pcSpeakerOutMethod; String yrw801Path; String tg100Path; @@ -2050,12 +2046,10 @@ class FurnaceGUI { esfmCore(0), opllCore(0), ayCore(0), - bubsysQuality(3), dsidQuality(3), gbQuality(3), pnQuality(3), saaQuality(3), - smQuality(3), arcadeCoreRender(1), ym2612CoreRender(0), snCoreRender(0), @@ -2072,12 +2066,10 @@ class FurnaceGUI { esfmCoreRender(0), opllCoreRender(0), ayCoreRender(0), - bubsysQualityRender(3), dsidQualityRender(3), gbQualityRender(3), pnQualityRender(3), saaQualityRender(3), - smQualityRender(3), pcSpeakerOutMethod(0), yrw801Path(""), tg100Path(""), diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index d42a6d1a1..386880b43 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -2120,12 +2120,10 @@ void FurnaceGUI::drawSettings() { ImGui::SetTooltip(_("used in audio export")); } - CORE_QUALITY("Bubble System WSG",bubsysQuality,bubsysQualityRender); CORE_QUALITY("Game Boy",gbQuality,gbQualityRender); CORE_QUALITY("PowerNoise",pnQuality,pnQualityRender); CORE_QUALITY("SAA1099",saaQuality,saaQualityRender); CORE_QUALITY("SID (dSID)",dsidQuality,dsidQualityRender); - CORE_QUALITY("SM8521",smQuality,smQualityRender); ImGui::EndTable(); } @@ -5126,12 +5124,10 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { settings.opllCore=conf.getInt("opllCore",0); settings.ayCore=conf.getInt("ayCore",0); - settings.bubsysQuality=conf.getInt("bubsysQuality",3); settings.dsidQuality=conf.getInt("dsidQuality",3); settings.gbQuality=conf.getInt("gbQuality",3); settings.pnQuality=conf.getInt("pnQuality",3); settings.saaQuality=conf.getInt("saaQuality",3); - settings.smQuality=conf.getInt("smQuality",3); settings.arcadeCoreRender=conf.getInt("arcadeCoreRender",1); settings.ym2612CoreRender=conf.getInt("ym2612CoreRender",0); @@ -5150,12 +5146,10 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { settings.opllCoreRender=conf.getInt("opllCoreRender",0); settings.ayCoreRender=conf.getInt("ayCoreRender",0); - settings.bubsysQualityRender=conf.getInt("bubsysQualityRender",3); settings.dsidQualityRender=conf.getInt("dsidQualityRender",3); settings.gbQualityRender=conf.getInt("gbQualityRender",3); settings.pnQualityRender=conf.getInt("pnQualityRender",3); settings.saaQualityRender=conf.getInt("saaQualityRender",3); - settings.smQualityRender=conf.getInt("smQualityRender",3); settings.pcSpeakerOutMethod=conf.getInt("pcSpeakerOutMethod",0); @@ -5190,12 +5184,10 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { clampSetting(settings.esfmCore,0,1); clampSetting(settings.opllCore,0,1); clampSetting(settings.ayCore,0,1); - clampSetting(settings.bubsysQuality,0,5); clampSetting(settings.dsidQuality,0,5); clampSetting(settings.gbQuality,0,5); clampSetting(settings.pnQuality,0,5); clampSetting(settings.saaQuality,0,5); - clampSetting(settings.smQuality,0,5); clampSetting(settings.arcadeCoreRender,0,1); clampSetting(settings.ym2612CoreRender,0,2); clampSetting(settings.snCoreRender,0,1); @@ -5212,12 +5204,10 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { clampSetting(settings.esfmCoreRender,0,1); clampSetting(settings.opllCoreRender,0,1); clampSetting(settings.ayCoreRender,0,1); - clampSetting(settings.bubsysQualityRender,0,5); clampSetting(settings.dsidQualityRender,0,5); clampSetting(settings.gbQualityRender,0,5); clampSetting(settings.pnQualityRender,0,5); clampSetting(settings.saaQualityRender,0,5); - clampSetting(settings.smQualityRender,0,5); clampSetting(settings.pcSpeakerOutMethod,0,4); clampSetting(settings.mainFont,0,6); clampSetting(settings.patFont,0,6); @@ -5708,12 +5698,10 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { conf.set("opllCore",settings.opllCore); conf.set("ayCore",settings.ayCore); - conf.set("bubsysQuality",settings.bubsysQuality); conf.set("dsidQuality",settings.dsidQuality); conf.set("gbQuality",settings.gbQuality); conf.set("pnQuality",settings.pnQuality); conf.set("saaQuality",settings.saaQuality); - conf.set("smQuality",settings.smQuality); conf.set("arcadeCoreRender",settings.arcadeCoreRender); conf.set("ym2612CoreRender",settings.ym2612CoreRender); @@ -5732,12 +5720,10 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { conf.set("opllCoreRender",settings.opllCoreRender); conf.set("ayCoreRender",settings.ayCoreRender); - conf.set("bubsysQualityRender",settings.bubsysQualityRender); conf.set("dsidQualityRender",settings.dsidQualityRender); conf.set("gbQualityRender",settings.gbQualityRender); conf.set("pnQualityRender",settings.pnQualityRender); conf.set("saaQualityRender",settings.saaQualityRender); - conf.set("smQualityRender",settings.smQualityRender); conf.set("pcSpeakerOutMethod",settings.pcSpeakerOutMethod); @@ -5790,12 +5776,10 @@ void FurnaceGUI::commitSettings() { settings.esfmCore!=e->getConfInt("esfmCore",0) || settings.opllCore!=e->getConfInt("opllCore",0) || settings.ayCore!=e->getConfInt("ayCore",0) || - settings.bubsysQuality!=e->getConfInt("bubsysQuality",3) || settings.dsidQuality!=e->getConfInt("dsidQuality",3) || settings.gbQuality!=e->getConfInt("gbQuality",3) || settings.pnQuality!=e->getConfInt("pnQuality",3) || settings.saaQuality!=e->getConfInt("saaQuality",3) || - settings.smQuality!=e->getConfInt("smQuality",3) || settings.audioQuality!=e->getConfInt("audioQuality",0) || settings.audioHiPass!=e->getConfInt("audioHiPass",1) );