diff --git a/boot/pmain.c b/boot/pmain.c index a4e89cb7..754b6484 100644 --- a/boot/pmain.c +++ b/boot/pmain.c @@ -1033,8 +1033,8 @@ static int init_modules(int argc, char *argv[]) { fprintf(stderr, "ocp.ini update (0.2.107) add [libsidplayfp] filterrange6581=0.5\n"); cfSetProfileString ("libsidplayfp", "filterrange6581", "0.5"); - fprintf(stderr, "ocp.ini update (0.2.107) add [libsidplayfp] combinedwaveforms=Average\n"); - cfSetProfileString ("libsidplayfp", "combinedwaveforms", "Average"); + fprintf(stderr, "ocp.ini update (0.2.107) add [libsidplayfp] combinedwaveforms=Strong\n"); + cfSetProfileString ("libsidplayfp", "combinedwaveforms", "Strong"); } if (epoch < 20240510) diff --git a/ocp.ini.in b/ocp.ini.in index c6708dd0..204f780d 100644 --- a/ocp.ini.in +++ b/ocp.ini.in @@ -131,9 +131,9 @@ ; filtercurve8580=0.5 Controls the filter curve for the MOS8580 SID model if emulator=residfp. ; Ranges from 0.0 (light) to 1.0 (dark), the default value is 0.5. filtercurve8580=0.5 -; combinedwaveforms=Average Controls the strength of the combined waveforms. Options are +; combinedwaveforms=Strong Controls the strength of the combined waveforms. Options are ; Average, Weak and Strong, default value is Average - combinedwaveforms=Average + combinedwaveforms=Strong ; digiboost=on/off Enable digiboost for MOS8580 SID model. digiboost=off ; kernal, basic and chargen makes it possible to specify path to ROM images, that the C64 diff --git a/playsid/Makefile b/playsid/Makefile index 6f331890..38ee5827 100644 --- a/playsid/Makefile +++ b/playsid/Makefile @@ -76,7 +76,7 @@ LIBSIDPLAYOBJECTS=libsidplayfp-builders-resid-builder-resid-builder.o \ all: $(TARGETS) $(DUMPSID) clean: - rm -f *.o *$(LIB_SUFFIX) libsidplayfp-git/src/sidtune/sidplayer1.bin sidplayfp-git/libsidplayfp/src/sidtune/sidplayer2.bin dumpsid$(EXE_SUFFIX) \ + rm -f *.o *$(LIB_SUFFIX) libsidplayfp-git/src/sidtune/sidplayer1.bin libsidplayfp-git/libsidplayfp/src/sidtune/sidplayer2.bin libsidplayfp-git/src/psiddrv.bin dumpsid$(EXE_SUFFIX) \ libsidplayfp-git/src/builders/resid-builder/resid/wave6581__ST.h \ libsidplayfp-git/src/builders/resid-builder/resid/wave6581_P_T.h \ libsidplayfp-git/src/builders/resid-builder/resid/wave6581_PS_.h \ @@ -273,7 +273,8 @@ libsidplayfp-player.o: \ libsidplayfp-git/src/player.cpp $(LIBSIDPLAYCXX) $(LIBSIDPLAYCXXFLAGS) -o $@ $< -c libsidplayfp-psiddrv.o: \ - libsidplayfp-git/src/psiddrv.cpp + libsidplayfp-git/src/psiddrv.cpp \ + libsidplayfp-git/src/psiddrv.bin $(LIBSIDPLAYCXX) $(LIBSIDPLAYCXXFLAGS) -o $@ $< -c libsidplayfp-reloc65.o: \ libsidplayfp-git/src/reloc65.cpp @@ -314,6 +315,9 @@ libsidplayfp-git/src/sidtune/sidplayer1.bin: \ libsidplayfp-git/src/sidtune/sidplayer2.bin: \ libsidplayfp-git/src/sidtune/sidplayer2.a65 $(XA) -R -G $< -o - | $(HEXDUMP) -v -e '1/1 "0x%02X,\n"' > $@ +libsidplayfp-git/src/psiddrv.bin: \ + libsidplayfp-git/src/psiddrv.a65 + $(XA) -R -G $< -o - | $(HEXDUMP) -v -e '1/1 "0x%02X,\n"' > $@ libsidplayfp-sidtune-MUS.o: \ libsidplayfp-git/src/sidtune/MUS.cpp \ libsidplayfp-git/src/sidtune/sidplayer1.bin \ diff --git a/playsid/cpiinfo.cpp b/playsid/cpiinfo.cpp index 4902a852..0aca33fe 100644 --- a/playsid/cpiinfo.cpp +++ b/playsid/cpiinfo.cpp @@ -150,7 +150,7 @@ static void SidInfoDraw (struct cpifaceSessionAPI_t *cpifaceSession, int focus) if ((line >= 1) && (line < SidInfoHeight)) { - cpifaceSession->console->Driver->DisplayStr(SidInfoFirstLine + line, 0, 0x07, " \xb3 Libsidplayfp V2.7.0b-dev(035cba1) + OCP patches", SidInfoWidth-2); + cpifaceSession->console->Driver->DisplayStr(SidInfoFirstLine + line, 0, 0x07, " \xb3 Libsidplayfp v2.12.0 + OCP patches", SidInfoWidth-2); cpifaceSession->console->Driver->DisplayStr(SidInfoFirstLine + line, SidInfoWidth-2, 0x07, "\xb3", 1); } line++; diff --git a/playsid/libsidplayfp-api.cpp b/playsid/libsidplayfp-api.cpp index ce0b305b..e08e0614 100644 --- a/playsid/libsidplayfp-api.cpp +++ b/playsid/libsidplayfp-api.cpp @@ -78,15 +78,15 @@ namespace libsidplayfp { switch (model) { - case MOS656X::MOS6567R56A: + case MOS656X::model_t::MOS6567R56A: return "MOS6567R56A NTSC-M (old)"; - case MOS656X::MOS6567R8: + case MOS656X::model_t::MOS6567R8: return "MOS6567R8 NTSC-M"; - case MOS656X::MOS6569: + case MOS656X::model_t::MOS6569: return "MOS6569 PAL-B"; - case MOS656X::MOS6572: + case MOS656X::model_t::MOS6572: return "MOS6572 PAL-N"; - case MOS656X::MOS6573: + case MOS656X::model_t::MOS6573: return "MOS6573 PAL-M"; default: return "MOS65xx ??"; @@ -429,7 +429,9 @@ namespace libsidplayfp return false; } else { /* set up SID filter. HardSID just ignores call with def. */ - m_engCfg.sidEmulation->filter(m_filter.enabled); + sidplayer.filter(0, m_filter.enabled); + sidplayer.filter(1, m_filter.enabled); + sidplayer.filter(2, m_filter.enabled); } return true; @@ -541,7 +543,9 @@ namespace libsidplayfp void ConsolePlayer::SetFilter(bool enable) { const SidConfig &config = sidplayer.config (); - config.sidEmulation->filter (enable); + sidplayer.filter(0, enable); + sidplayer.filter(1, enable); + sidplayer.filter(2, enable); } void ConsolePlayer::SetBias(double bias) diff --git a/playsid/libsidplayfp-git b/playsid/libsidplayfp-git index 496d3954..76cd830c 160000 --- a/playsid/libsidplayfp-git +++ b/playsid/libsidplayfp-git @@ -1 +1 @@ -Subproject commit 496d395415d2c57caffecc8ab1321421a39ba69b +Subproject commit 76cd830c8e7460e07197ad013edd334307c5cd85 diff --git a/playsid/sidconfig.c b/playsid/sidconfig.c index 372f24d7..5cf88ccd 100644 --- a/playsid/sidconfig.c +++ b/playsid/sidconfig.c @@ -1075,7 +1075,7 @@ static void sidConfigRun (void **token, const struct DevInterfaceAPI_t *API) config_filtercurve6581 = float100x_to_int (API->configAPI->GetProfileString ("libsidplayfp", "filtercurve6581", "0.5")); config_filterrange6581 = float100x_to_int (API->configAPI->GetProfileString ("libsidplayfp", "filterrange6581", "0.5")); config_filtercurve8580 = float100x_to_int (API->configAPI->GetProfileString ("libsidplayfp", "filtercurve8580", "0.5")); - config_combinedwaveforms = CWS_to_int (API->configAPI->GetProfileString ("libsidplayfp", "combinedwaveforms", "Average")); + config_combinedwaveforms = CWS_to_int (API->configAPI->GetProfileString ("libsidplayfp", "combinedwaveforms", "Strong")); config_digiboost = API->configAPI->GetProfileBool ("libsidplayfp", "digiboost", 0, 0); config_kernal = strdup (API->configAPI->GetProfileString ("libsidplayfp", "kernal", "KERNEL.ROM")); config_basic = strdup (API->configAPI->GetProfileString ("libsidplayfp", "basic", "BASIC.ROM"));