From f5d40bd1ee8c133d34814aef13c57899f5ab40db Mon Sep 17 00:00:00 2001 From: byuu <2107894+byuu@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:08:37 +0900 Subject: [PATCH] Testing: added Super Game Boy audio mixing test function. --- bsnes/sfc/coprocessor/icd/icd.cpp | 9 ++++++++- bsnes/sfc/dsp/dsp.cpp | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bsnes/sfc/coprocessor/icd/icd.cpp b/bsnes/sfc/coprocessor/icd/icd.cpp index ab2f7462..d94bb3be 100644 --- a/bsnes/sfc/coprocessor/icd/icd.cpp +++ b/bsnes/sfc/coprocessor/icd/icd.cpp @@ -40,7 +40,6 @@ namespace SameBoy { float left = sample->left / 32768.0f; float right = sample->right / 32768.0f; icd.apuWrite(left, right); - //print(dsp.stream->pending(), " ", icd.stream->pending(), "\n"); } static auto vblank(GB_gameboy_t*) -> void { @@ -59,6 +58,14 @@ auto ICD::Enter() -> void { } auto ICD::main() -> void { + #if 0 + static uint n = 0; + float x = sin((2 * 3.141592 * n++ * 1000.0) / 44100.0) * 0.1; + apuWrite(x, x); + step(128); + return synchronizeCPU(); + #endif + if(r6003 & 0x80) { auto clocks = GB_run(&sameboy); step(clocks >> 1); diff --git a/bsnes/sfc/dsp/dsp.cpp b/bsnes/sfc/dsp/dsp.cpp index 3d15e192..eb6f78bb 100644 --- a/bsnes/sfc/dsp/dsp.cpp +++ b/bsnes/sfc/dsp/dsp.cpp @@ -65,8 +65,8 @@ auto DSP::power(bool reset) -> void { } if(configuration.hacks.hotfixes) { - //Magical Drop (Japan) does not initialize the DSP registers at startup. - //Tokoton mode will hang forever in some instances even on real hardware. + //Magical Drop (Japan) does not initialize the DSP registers at startup: + //tokoton mode will hang forever in some instances even on real hardware. if(cartridge.headerTitle() == "MAGICAL DROP") { for(uint address : range(0x80)) spc_dsp.write(address, 0xff); }