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

Add opcode: loop_crossfade

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-29 23:52:10 +02:00
parent 7933bcec8d
commit f6d05509cb
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Defaults.h
View file

@ -54,6 +54,8 @@ namespace Default
constexpr Range<uint32_t> sampleCountRange { 0, std::numeric_limits<uint32_t>::max() }; constexpr Range<uint32_t> sampleCountRange { 0, std::numeric_limits<uint32_t>::max() };
constexpr SfzLoopMode loopMode { SfzLoopMode::no_loop }; constexpr SfzLoopMode loopMode { SfzLoopMode::no_loop };
constexpr Range<uint32_t> loopRange { 0, std::numeric_limits<uint32_t>::max() }; constexpr Range<uint32_t> loopRange { 0, std::numeric_limits<uint32_t>::max() };
constexpr float loopCrossfade { 1e-3 };
constexpr Range<float> loopCrossfadeRange { loopCrossfade, 1.0 };
// common defaults // common defaults
constexpr Range<uint8_t> midi7Range { 0, 127 }; constexpr Range<uint8_t> midi7Range { 0, 127 };

3
src/sfizz/Region.cpp
View file

@ -138,6 +138,9 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
case hash("loop_start"): // also loopstart case hash("loop_start"): // also loopstart
setRangeStartFromOpcode(opcode, loopRange, Default::loopRange); setRangeStartFromOpcode(opcode, loopRange, Default::loopRange);
break; break;
case hash("loop_crossfade"):
setValueFromOpcode(opcode, loopCrossfade, Default::loopCrossfadeRange);
break;
// Wavetable oscillator // Wavetable oscillator
case hash("oscillator_phase"): case hash("oscillator_phase"):

1
src/sfizz/Region.h
View file

@ -319,6 +319,7 @@ struct Region {
absl::optional<uint32_t> sampleCount {}; // count absl::optional<uint32_t> sampleCount {}; // count
absl::optional<SfzLoopMode> loopMode {}; // loopmode absl::optional<SfzLoopMode> loopMode {}; // loopmode
Range<uint32_t> loopRange { Default::loopRange }; //loopstart and loopend Range<uint32_t> loopRange { Default::loopRange }; //loopstart and loopend
float loopCrossfade { Default::loopCrossfade }; // loop_crossfade
// Wavetable oscillator // Wavetable oscillator
float oscillatorPhase { Default::oscillatorPhase }; float oscillatorPhase { Default::oscillatorPhase };

8
tests/RegionT.cpp
View file

@ -174,6 +174,14 @@ TEST_CASE("[Region] Parsing opcodes")
REQUIRE(region.loopRange == Range<uint32_t>(0, 4294967295)); REQUIRE(region.loopRange == Range<uint32_t>(0, 4294967295));
} }
SECTION("loop_crossfade")
{
region.parseOpcode({ "loop_crossfade", "0.5" });
REQUIRE(region.loopCrossfade == Approx(0.5f));
region.parseOpcode({ "loop_crossfade", "0" });
REQUIRE(region.loopCrossfade > 0);
}
SECTION("group") SECTION("group")
{ {
REQUIRE(region.group == 0); REQUIRE(region.group == 0);