From e7a95d482279bb1f0900cf970f9b1307c1dc0eba Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 6 Feb 2023 01:15:13 -0500 Subject: [PATCH] fix the pull request - again --- src/engine/platform/es5506.cpp | 18 ------------------ src/engine/sysDef.cpp | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/engine/platform/es5506.cpp b/src/engine/platform/es5506.cpp index 3b775eb0b..61ec89dd3 100644 --- a/src/engine/platform/es5506.cpp +++ b/src/engine/platform/es5506.cpp @@ -302,15 +302,6 @@ void DivPlatformES5506::tick(bool sysTick) { chan[i].filterChanged.k1=1; } break; - /*case 2: { // delta - const signed int next_k1=CLAMP(chan[i].k1Offs+chan[i].std.ex1.val,-65535,65535); - if (chan[i].k1Offs!=next_k1) { - chan[i].k1Offs=next_k1; - chan[i].filterChanged.k1=1; - } - break; - } - */ default: break; } @@ -329,15 +320,6 @@ void DivPlatformES5506::tick(bool sysTick) { chan[i].filterChanged.k2=1; } break; - /*case 2: { // delta - const signed int next_k2=CLAMP(chan[i].k2Offs+chan[i].std.ex2.val,-65535,65535); - if (chan[i].k2Offs!=next_k2) { - chan[i].k2Offs=next_k2; - chan[i].filterChanged.k2=1; - } - break; - } - */ default: break; } diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 9cce4e095..c6368cc84 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -1551,7 +1551,7 @@ void DivEngine::registerSystems() { ); EffectHandlerMap es5506PreEffectHandlerMap={ - {0x10, {DIV_CMD_WAVE, "10xx: Change waveform or sample (00 to FF)",effectVal}}, + {0x10, {DIV_CMD_WAVE, "10xx: Change waveform (00 to FF)",effectVal}}, {0x11, {DIV_CMD_ES5506_FILTER_MODE, "11xx: Set filter mode (00 to 03)",effectValAnd<3>}}, {0x14, {DIV_CMD_ES5506_FILTER_K1, "14xx: Set filter coefficient K1 low byte (00 to FF)",effectValShift<0>,constVal<0x00ff>}}, {0x15, {DIV_CMD_ES5506_FILTER_K1, "15xx: Set filter coefficient K1 high byte (00 to FF)",effectValShift<8>,constVal<0xff00>}}, @@ -1582,7 +1582,7 @@ void DivEngine::registerSystems() { // TODO: custom sample format sysDefs[DIV_SYSTEM_ES5506]=new DivSysDef( "Ensoniq ES5506", NULL, 0xb1, 0, 32, false, true, 0/*0x171*/, false, (1U<