diff --git a/.gitmodules b/.gitmodules index 075769005..8c4c6b0dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,7 @@ [submodule "extern/cam900_vgsound_emu"] path = extern/cam900_vgsound_emu url = https://github.com/cam900/vgsound_emu + branch = main [submodule "extern/Nuked-OPL3"] path = extern/Nuked-OPL3 url = https://github.com/nukeykt/Nuked-OPL3.git diff --git a/extern/cam900_vgsound_emu b/extern/cam900_vgsound_emu index cf4ba11ad..3f8b5c5c6 160000 --- a/extern/cam900_vgsound_emu +++ b/extern/cam900_vgsound_emu @@ -1 +1 @@ -Subproject commit cf4ba11ad786f13c374afb77616d509cb4c751bf +Subproject commit 3f8b5c5c6b996588afec7e4ce7469abccf16ecbe diff --git a/src/engine/platform/x1_010.h b/src/engine/platform/x1_010.h index 27bf4f4a6..fd00fd1c9 100644 --- a/src/engine/platform/x1_010.h +++ b/src/engine/platform/x1_010.h @@ -26,11 +26,11 @@ #include "../macroInt.h" #include "../../../extern/cam900_vgsound_emu/x1_010/x1_010.hpp" -class DivX1_010Interface: public x1_010_intf { +class DivX1_010Interface: public vgsound_emu_mem_intf { public: DivEngine* parent; int sampleBank; - virtual u8 read_rom(uint32_t address) override { + virtual u8 read_byte(u32 address) override { if (parent->x1_010Mem==NULL) return 0; return parent->x1_010Mem[address & 0xfffff]; }