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

Merge pull request #126 from jpcima/wavetable-tune

Browse source 
Proper tuning of wavetable generators
This commit is contained in:
JP Cimalando 2020-03-16 18:42:02 +01:00 • committed by GitHub
commit 474f221f91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Defaults.h
View file

@ -177,7 +177,7 @@ namespace Default
constexpr int transpose { 0 }; constexpr int transpose { 0 };
constexpr Range<int> transposeRange { -127, 127 }; constexpr Range<int> transposeRange { -127, 127 };
constexpr int tune { 0 }; constexpr int tune { 0 };
constexpr Range<int> tuneRange { -100, 100 }; constexpr Range<int> tuneRange { -9600, 9600 }; // ±100 in SFZv1, more in ARIA
constexpr Range<int> bendBoundRange { -9600, 9600 }; constexpr Range<int> bendBoundRange { -9600, 9600 };
constexpr Range<int> bendStepRange { 1, 1200 }; constexpr Range<int> bendStepRange { 1, 1200 };
constexpr int bendUp { 200 }; // No range here because the bounds can be inverted constexpr int bendUp { 200 }; // No range here because the bounds can be inverted

2
src/sfizz/MathHelpers.h
View file

@ -110,7 +110,7 @@ namespace Random {
*/ */
inline float midiNoteFrequency(const int noteNumber) inline float midiNoteFrequency(const int noteNumber)
{ {
return 440.0f * std::pow(2.0f, (noteNumber - 69) / 12.0f); return 440.0f * std::pow(2.0f, (noteNumber - 69) * (1.0f / 12.0f));
} }
/** /**

3
src/sfizz/Voice.cpp
View file

@ -506,7 +506,8 @@ void sfz::Voice::fillWithGenerator(AudioSpan<float> buffer) noexcept
auto frequencies = tempSpan1.first(buffer.getNumFrames()); auto frequencies = tempSpan1.first(buffer.getNumFrames());
auto bends = tempSpan2.first(buffer.getNumFrames()); auto bends = tempSpan2.first(buffer.getNumFrames());
fill<float>(frequencies, baseFrequency); float keycenterFrequency = midiNoteFrequency(region->pitchKeycenter);
fill<float>(frequencies, pitchRatio * keycenterFrequency);
if (region->bendStep > 1) if (region->bendStep > 1)
pitchBendEnvelope.getQuantizedBlock(bends, bendStepFactor); pitchBendEnvelope.getQuantizedBlock(bends, bendStepFactor);

8
tests/RegionT.cpp
View file

@ -792,10 +792,10 @@ TEST_CASE("[Region] Parsing opcodes")
REQUIRE(region.tune == 40); REQUIRE(region.tune == 40);
region.parseOpcode({ "tune", "-1" }); region.parseOpcode({ "tune", "-1" });
REQUIRE(region.tune == -1); REQUIRE(region.tune == -1);
region.parseOpcode({ "tune", "154" }); region.parseOpcode({ "tune", "15432" });
REQUIRE(region.tune == 100); REQUIRE(region.tune == 9600);
region.parseOpcode({ "tune", "-154" }); region.parseOpcode({ "tune", "-15432" });
REQUIRE(region.tune == -100); REQUIRE(region.tune == -9600);
} }
SECTION("bend_up, bend_down, bend_step") SECTION("bend_up, bend_down, bend_step")