diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h index 603e36b7..71473749 100644 --- a/src/sfizz/Defaults.h +++ b/src/sfizz/Defaults.h @@ -69,8 +69,8 @@ namespace Default constexpr Range oscillatorModeRange { 0, 2 }; constexpr Range oscillatorMultiRange { 1, config::oscillatorsPerVoice }; constexpr float oscillatorDetune { 0 }; - constexpr Range oscillatorDetuneRange { -9600, 9600 }; - constexpr Range oscillatorDetuneCCRange { -9600, 9600 }; + constexpr Range oscillatorDetuneRange { -12000, 12000 }; + constexpr Range oscillatorDetuneCCRange { -12000, 12000 }; constexpr float oscillatorModDepth { 0 }; constexpr Range oscillatorModDepthRange { 0, 10000 }; // depth%, allowed to be >100 for FM constexpr Range oscillatorModDepthCCRange { 0, 10000 }; @@ -166,12 +166,12 @@ namespace Default constexpr float filterResonanceCC { 0 }; constexpr float filterGainCC { 0 }; constexpr Range filterCutoffRange { 0.0f, 20000.0f }; - constexpr Range filterCutoffModRange { -9600, 9600 }; + constexpr Range filterCutoffModRange { -12000, 12000 }; constexpr Range filterGainRange { -96.0f, 96.0f }; constexpr Range filterGainModRange { -96.0f, 96.0f }; constexpr Range filterKeytrackRange { 0, 1200 }; - constexpr Range filterRandomRange { 0, 9600 }; - constexpr Range filterVeltrackRange { -9600, 9600 }; + constexpr Range filterRandomRange { 0, 12000 }; + constexpr Range filterVeltrackRange { -12000, 12000 }; constexpr Range filterResonanceRange { 0.0f, 96.0f }; constexpr Range filterResonanceModRange { 0.0f, 96.0f }; @@ -200,15 +200,15 @@ namespace Default constexpr int pitchKeytrack { 100 }; constexpr Range pitchKeytrackRange { -1200, 1200 }; constexpr float pitchRandom { 0 }; - constexpr Range pitchRandomRange { 0, 9600 }; + constexpr Range pitchRandomRange { 0, 12000 }; constexpr int pitchVeltrack { 0 }; - constexpr Range pitchVeltrackRange { -9600, 9600 }; + constexpr Range pitchVeltrackRange { -12000, 12000 }; constexpr int transpose { 0 }; constexpr Range transposeRange { -127, 127 }; constexpr int tune { 0 }; - constexpr Range tuneRange { -9600, 9600 }; // ±100 in SFZv1, more in ARIA - constexpr Range tuneCCRange { -9600, 9600 }; - constexpr Range bendBoundRange { -9600, 9600 }; + constexpr Range tuneRange { -12000, 12000 }; // ±100 in SFZv1, more in ARIA + constexpr Range tuneCCRange { -12000, 12000 }; + constexpr Range bendBoundRange { -12000, 12000 }; constexpr Range bendStepRange { 1, 1200 }; constexpr int bendUp { 200 }; // No range here because the bounds can be inverted constexpr int bendDown { -200 }; diff --git a/tests/RegionT.cpp b/tests/RegionT.cpp index b07f4816..4e8419e1 100644 --- a/tests/RegionT.cpp +++ b/tests/RegionT.cpp @@ -960,8 +960,8 @@ TEST_CASE("[Region] Parsing opcodes") REQUIRE(region.pitchRandom == 40); region.parseOpcode({ "pitch_random", "-1" }); REQUIRE(region.pitchRandom == 0); - region.parseOpcode({ "pitch_random", "10320" }); - REQUIRE(region.pitchRandom == 9600); + region.parseOpcode({ "pitch_random", "12320" }); + REQUIRE(region.pitchRandom == 12000); } SECTION("pitch_veltrack") @@ -972,9 +972,9 @@ TEST_CASE("[Region] Parsing opcodes") region.parseOpcode({ "pitch_veltrack", "-1" }); REQUIRE(region.pitchVeltrack == -1); region.parseOpcode({ "pitch_veltrack", "13020" }); - REQUIRE(region.pitchVeltrack == 9600); + REQUIRE(region.pitchVeltrack == 12000); region.parseOpcode({ "pitch_veltrack", "-13020" }); - REQUIRE(region.pitchVeltrack == -9600); + REQUIRE(region.pitchVeltrack == -12000); } SECTION("transpose") @@ -998,9 +998,9 @@ TEST_CASE("[Region] Parsing opcodes") region.parseOpcode({ "tune", "-1" }); REQUIRE(region.tune == -1); region.parseOpcode({ "tune", "15432" }); - REQUIRE(region.tune == 9600); + REQUIRE(region.tune == 12000); region.parseOpcode({ "tune", "-15432" }); - REQUIRE(region.tune == -9600); + REQUIRE(region.tune == -12000); } SECTION("bend_up, bend_down, bend_step, bend_smooth") @@ -1012,18 +1012,18 @@ TEST_CASE("[Region] Parsing opcodes") REQUIRE(region.bendUp == 400); region.parseOpcode({ "bend_up", "-200" }); REQUIRE(region.bendUp == -200); - region.parseOpcode({ "bend_up", "9700" }); - REQUIRE(region.bendUp == 9600); - region.parseOpcode({ "bend_up", "-9700" }); - REQUIRE(region.bendUp == -9600); + region.parseOpcode({ "bend_up", "12700" }); + REQUIRE(region.bendUp == 12000); + region.parseOpcode({ "bend_up", "-12700" }); + REQUIRE(region.bendUp == -12000); region.parseOpcode({ "bend_down", "400" }); REQUIRE(region.bendDown == 400); region.parseOpcode({ "bend_down", "-200" }); REQUIRE(region.bendDown == -200); - region.parseOpcode({ "bend_down", "9700" }); - REQUIRE(region.bendDown == 9600); - region.parseOpcode({ "bend_down", "-9700" }); - REQUIRE(region.bendDown == -9600); + region.parseOpcode({ "bend_down", "12700" }); + REQUIRE(region.bendDown == 12000); + region.parseOpcode({ "bend_down", "-12700" }); + REQUIRE(region.bendDown == -12000); region.parseOpcode({ "bend_step", "400" }); REQUIRE(region.bendStep == 400); region.parseOpcode({ "bend_step", "-200" }); @@ -1389,10 +1389,10 @@ TEST_CASE("[Region] Parsing opcodes") REQUIRE(region.filters[0].veltrack == 50); region.parseOpcode({ "fil_veltrack", "-5" }); REQUIRE(region.filters[0].veltrack == -5); - region.parseOpcode({ "fil_veltrack", "10000" }); - REQUIRE(region.filters[0].veltrack == 9600); - region.parseOpcode({ "fil_veltrack", "-10000" }); - REQUIRE(region.filters[0].veltrack == -9600); + region.parseOpcode({ "fil_veltrack", "13000" }); + REQUIRE(region.filters[0].veltrack == 12000); + region.parseOpcode({ "fil_veltrack", "-13000" }); + REQUIRE(region.filters[0].veltrack == -12000); REQUIRE(region.filters[0].keycenter == 60); region.parseOpcode({ "fil_keycenter", "50" }); @@ -1729,7 +1729,7 @@ TEST_CASE("[Region] Parsing opcodes") region.parseOpcode({ "tune_stepcc120", "24" }); REQUIRE(view.at(120).step == 24.0f); region.parseOpcode({ "pitch_stepcc120", "15482" }); - REQUIRE(view.at(120).step == 9600.0f); + REQUIRE(view.at(120).step == 12000.0f); region.parseOpcode({ "tune_stepcc120", "-2" }); REQUIRE(view.at(120).step == 0.0f); }