From 0cdb1f70447f435da34559770f73acb9094e4411 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sat, 16 May 2020 23:17:56 +0200 Subject: [PATCH] Revert start_lohdccN to 0-1, confirmed by plgDavid --- src/sfizz/Region.cpp | 8 ++++---- tests/RegionT.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index 9e705904..b6613c69 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -324,14 +324,14 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) case hash("start_lohdcc&"): // also on_lohdcc& if (opcode.parameters.back() >= config::numCCs) return false; - if (auto value = readOpcode(opcode.value, Default::midi7Range.to())) - ccTriggers[opcode.parameters.back()].setStart(normalizeCC(*value)); + if (auto value = readOpcode(opcode.value, Default::normalizedRange)) + ccTriggers[opcode.parameters.back()].setStart(*value); break; case hash("start_hihdcc&"): // also on_hihdcc& if (opcode.parameters.back() >= config::numCCs) return false; - if (auto value = readOpcode(opcode.value, Default::midi7Range.to())) - ccTriggers[opcode.parameters.back()].setEnd(normalizeCC(*value)); + if (auto value = readOpcode(opcode.value, Default::normalizedRange)) + ccTriggers[opcode.parameters.back()].setEnd(*value); break; // Performance parameters: amplifier diff --git a/tests/RegionT.cpp b/tests/RegionT.cpp index b7f88d92..4884274b 100644 --- a/tests/RegionT.cpp +++ b/tests/RegionT.cpp @@ -501,14 +501,14 @@ TEST_CASE("[Region] Parsing opcodes") for (int ccIdx = 1; ccIdx < 128; ++ccIdx) { REQUIRE(!region.ccTriggers.contains(ccIdx)); } - region.parseOpcode({ "on_lohdcc46", "15.9" }); + region.parseOpcode({ "on_lohdcc46", "0.15" }); REQUIRE(region.ccTriggers.contains(46)); - REQUIRE(region.ccTriggers[46].getStart() == Approx(15.9_norm)); + REQUIRE(region.ccTriggers[46].getStart() == Approx(0.15f)); REQUIRE(region.ccTriggers[46].getEnd() == 1.0f); - region.parseOpcode({ "on_hihdcc5", "47.3" }); + region.parseOpcode({ "on_hihdcc5", "0.47" }); REQUIRE(region.ccTriggers.contains(5)); REQUIRE(region.ccTriggers[5].getStart() == 0.0f); - REQUIRE(region.ccTriggers[5].getEnd() == Approx(47.3_norm)); + REQUIRE(region.ccTriggers[5].getEnd() == Approx(0.47f)); } SECTION("volume")