sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #468 from paulfd/larger-amplitude

Browse source 
Put a high amplitude range
This commit is contained in:
JP Cimalando 2020-10-04 17:38:40 +02:00 • committed by GitHub
commit 0086760020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Defaults.h
View file

@ -122,7 +122,7 @@ namespace Default
constexpr Range<float> volumeRange { -144.0, 48.0 }; constexpr Range<float> volumeRange { -144.0, 48.0 };
constexpr Range<float> volumeCCRange { -144.0, 48.0 }; constexpr Range<float> volumeCCRange { -144.0, 48.0 };
constexpr float amplitude { 100.0 }; constexpr float amplitude { 100.0 };
constexpr Range<float> amplitudeRange { 0.0, 100.0 }; constexpr Range<float> amplitudeRange { 0.0, 1e8 };
constexpr float pan { 0.0 }; constexpr float pan { 0.0 };
constexpr Range<float> panRange { -100.0, 100.0 }; constexpr Range<float> panRange { -100.0, 100.0 };
constexpr Range<float> panCCRange { -200.0, 200.0 }; constexpr Range<float> panCCRange { -200.0, 200.0 };

6
tests/RegionT.cpp
View file

@ -925,7 +925,7 @@ TEST_CASE("[Region] Parsing opcodes")
region.parseOpcode({ a.first, "-40" }); region.parseOpcode({ a.first, "-40" });
REQUIRE(*a.second == 0_a); REQUIRE(*a.second == 0_a);
region.parseOpcode({ a.first, "140" }); region.parseOpcode({ a.first, "140" });
REQUIRE(*a.second == 1.0_a); REQUIRE(*a.second == 1.4_a);
} }
} }
@ -1640,7 +1640,7 @@ TEST_CASE("[Region] Parsing opcodes")
region.parseOpcode({ "amplitude", "-40" }); region.parseOpcode({ "amplitude", "-40" });
REQUIRE(region.amplitude == 0_a); REQUIRE(region.amplitude == 0_a);
region.parseOpcode({ "amplitude", "140" }); region.parseOpcode({ "amplitude", "140" });
REQUIRE(region.amplitude == 1.0_a); REQUIRE(region.amplitude == 1.4_a);
} }
SECTION("amplitude_cc") SECTION("amplitude_cc")
@ -1667,7 +1667,7 @@ TEST_CASE("[Region] Parsing opcodes")
region.parseOpcode({ "amplitude_stepcc120", "24" }); region.parseOpcode({ "amplitude_stepcc120", "24" });
REQUIRE(view.at(120).step == 24.0_a); REQUIRE(view.at(120).step == 24.0_a);
region.parseOpcode({ "amplitude_stepcc120", "15482" }); region.parseOpcode({ "amplitude_stepcc120", "15482" });
REQUIRE(view.at(120).step == 100.0_a); REQUIRE(view.at(120).step == 15482.0_a);
region.parseOpcode({ "amplitude_stepcc120", "-2" }); region.parseOpcode({ "amplitude_stepcc120", "-2" });
REQUIRE(view.at(120).step == 0.0f); REQUIRE(view.at(120).step == 0.0f);
} }