From 8344810ccbabb4cd5a0279e14cf73682e17e12ae Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 5 Jul 2020 14:41:33 +0200 Subject: [PATCH 1/7] Stub for timePosition atoms Avoid a warning in the LV2 log for the time being --- lv2/sfizz.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lv2/sfizz.c b/lv2/sfizz.c index e779a72b..d3459ef0 100644 --- a/lv2/sfizz.c +++ b/lv2/sfizz.c @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -146,6 +147,7 @@ typedef struct LV2_URID sfizz_oversampling_uri; LV2_URID sfizz_log_status_uri; LV2_URID sfizz_check_modification_uri; + LV2_URID time_position_uri; // Sfizz related data sfizz_synth_t *synth; @@ -220,6 +222,7 @@ sfizz_lv2_map_required_uris(sfizz_plugin_t *self) self->sfizz_oversampling_uri = map->map(map->handle, SFIZZ__oversampling); self->sfizz_log_status_uri = map->map(map->handle, SFIZZ__logStatus); self->sfizz_check_modification_uri = map->map(map->handle, SFIZZ__checkModification); + self->time_position_uri = map->map(map->handle, LV2_TIME__Position); } static void @@ -742,6 +745,10 @@ run(LV2_Handle instance, uint32_t sample_count) sfizz_lv2_send_file_path(self, self->sfizz_scala_file_uri, self->scala_file_path); } } + else if (obj->body.otype == self->time_position_uri) + { + // TODO: Handle time position atom + } else { lv2_log_warning(&self->logger, "[sfizz] Got an Object atom but it was not supported\n"); From d363627f214f6017f03c10a2e96b315a37e91e3d Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 5 Jul 2020 16:42:06 +0200 Subject: [PATCH 2/7] Added include files in CMakeLists as support for QtCreator IDE --- clients/CMakeLists.txt | 8 +-- devtools/CMakeLists.txt | 2 +- lv2/CMakeLists.txt | 8 ++- src/CMakeLists.txt | 110 ++++++++++++++++++++++++++++++++++++++-- vst/CMakeLists.txt | 17 ++++++- 5 files changed, 135 insertions(+), 10 deletions(-) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 322315c7..859005c0 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -4,7 +4,7 @@ if (SFIZZ_JACK) find_package(PkgConfig REQUIRED) pkg_check_modules(JACK "jack" REQUIRED) - add_executable (sfizz_jack jack_client.cpp) + add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse ${JACK_LIBRARIES}) sfizz_enable_lto_if_needed (sfizz_jack) @@ -13,11 +13,13 @@ if (SFIZZ_JACK) endif() if (SFIZZ_RENDER) - add_library(sfizz-fmidi STATIC "external/fmidi/sources/fmidi/fmidi_mini.cpp") + add_library(sfizz-fmidi STATIC + "external/fmidi/sources/fmidi/fmidi.h" + "external/fmidi/sources/fmidi/fmidi_mini.cpp") target_include_directories(sfizz-fmidi PUBLIC "external/fmidi/sources") target_compile_definitions(sfizz-fmidi PUBLIC "FMIDI_STATIC=1" "FMIDI_DISABLE_DESCRIBE_API=1") - add_executable(sfizz_render sfizz_render.cpp) + add_executable(sfizz_render MidiHelpers.h sfizz_render.cpp) target_link_libraries(sfizz_render PRIVATE sfizz::sfizz sfizz-fmidi sfizz-sndfile) sfizz_enable_lto_if_needed (sfizz_render) install (TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "render" OPTIONAL) diff --git a/devtools/CMakeLists.txt b/devtools/CMakeLists.txt index 399bb479..e5ea35f6 100644 --- a/devtools/CMakeLists.txt +++ b/devtools/CMakeLists.txt @@ -8,7 +8,7 @@ endif() find_package(Qt5 COMPONENTS Widgets) if(JACK_FOUND AND TARGET Qt5::Widgets) - add_executable(sfizz_capture_eg CaptureEG.cpp) + add_executable(sfizz_capture_eg CaptureEG.h CaptureEG.cpp) target_include_directories(sfizz_capture_eg PRIVATE . ${JACK_INCLUDE_DIRS}) target_link_libraries(sfizz_capture_eg PRIVATE sfizz-sndfile Qt5::Widgets ${JACK_LIBRARIES}) set_target_properties(sfizz_capture_eg PROPERTIES AUTOUIC ON) diff --git a/lv2/CMakeLists.txt b/lv2/CMakeLists.txt index 17e1dcfb..1eaf89de 100644 --- a/lv2/CMakeLists.txt +++ b/lv2/CMakeLists.txt @@ -11,7 +11,13 @@ set (LV2PLUGIN_TTL_SRC_FILES manifest.ttl.in ${PROJECT_NAME}.ttl.in ) -add_library (${LV2PLUGIN_PRJ_NAME} MODULE ${PROJECT_NAME}.c ${LV2PLUGIN_TTL_SRC_FILES}) +source_group("Turtle Files" FILES + ${LV2PLUGIN_TTL_SRC_FILES} +) +add_library (${LV2PLUGIN_PRJ_NAME} MODULE + ${PROJECT_NAME}.c + atomic_compat.h + ${LV2PLUGIN_TTL_SRC_FILES}) target_link_libraries (${LV2PLUGIN_PRJ_NAME} ${PROJECT_NAME}::${PROJECT_NAME}) # Explicitely strip all symbols on Linux but lv2_descriptor() # MacOS linker does not support this apparently https://bugs.webkit.org/show_bug.cgi?id=144555 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 554915fe..08bade62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,6 +3,83 @@ include (GNUInstallDirs) add_subdirectory(external/kiss_fft) add_subdirectory(external/cpuid) +set (SFIZZ_HEADERS + sfizz/ADSREnvelope.h + sfizz/AudioBuffer.h + sfizz/AudioSpan.h + sfizz/Buffer.h + sfizz/BufferPool.h + sfizz/CCMap.h + sfizz/Config.h + sfizz/Curve.h + sfizz/Debug.h + sfizz/effects/impl/ResonantArray.h + sfizz/effects/impl/ResonantArrayAVX.h + sfizz/effects/impl/ResonantArraySSE.h + sfizz/effects/impl/ResonantString.h + sfizz/effects/impl/ResonantStringAVX.h + sfizz/effects/impl/ResonantStringSSE.h + sfizz/effects/Apan.h + sfizz/effects/CommonLFO.h + sfizz/effects/CommonLFO.hpp + sfizz/effects/Eq.h + sfizz/effects/Filter.h + sfizz/effects/Gain.h + sfizz/effects/Limiter.h + sfizz/effects/Lofi.h + sfizz/effects/Nothing.h + sfizz/effects/Rectify.h + sfizz/effects/Strings.h + sfizz/effects/Width.h + sfizz/Effects.h + sfizz/EGDescription.h + sfizz/EQDescription.h + sfizz/EQPool.h + sfizz/FileId.h + sfizz/FileInstrument.h + sfizz/FilePool.h + sfizz/FilterDescription.h + sfizz/FilterPool.h + sfizz/HistoricalBuffer.h + sfizz/Interpolators.h + sfizz/Interpolators.hpp + sfizz/Logger.h + sfizz/MathHelpers.h + sfizz/MidiState.h + sfizz/ModifierHelpers.h + sfizz/Modifiers.h + sfizz/NumericId.h + sfizz/OnePoleFilter.h + sfizz/Oversampler.h + sfizz/Panning.h + sfizz/PolyphonyGroup.h + sfizz/railsback/2-1.h + sfizz/railsback/4-1.h + sfizz/railsback/4-2.h + sfizz/Region.h + sfizz/RegionSet.h + sfizz/Resources.h + sfizz/RTSemaphore.h + sfizz/ScopedFTZ.h + sfizz/SfzFilter.h + sfizz/simd/Common.h + sfizz/simd/HelpersAVX.h + sfizz/simd/HelpersScalar.h + sfizz/simd/HelpersSSE.h + sfizz/SIMDConfig.h + sfizz/SIMDHelpers.h + sfizz/SisterVoiceRing.h + sfizz/Smoothers.h + sfizz/SwapAndPop.h + sfizz/Synth.h + sfizz/SynthConfig.h + sfizz/Tuning.h + sfizz/Voice.h + sfizz/VoiceStealing.h + sfizz/Wavetables.h + sfizz.h + sfizz.hpp) + set (SFIZZ_SOURCES sfizz/Synth.cpp sfizz/FileId.cpp @@ -50,17 +127,41 @@ include (SfizzSIMDSourceFiles) sfizz_add_simd_sources (SFIZZ_SOURCES ".") # Parser core library +set (SFIZZ_PARSER_HEADERS + sfizz/Defaults.h + sfizz/LeakDetector.h + sfizz/Range.h + sfizz/Opcode.h + sfizz/Macros.h + sfizz/Parser.h + sfizz/parser/Parser.h + sfizz/parser/ParserPrivate.h + sfizz/parser/ParserPrivate.hpp + sfizz/SfzHelpers.h + sfizz/StringViewHelpers.h) + +set (SFIZZ_PARSER_SOURCES + sfizz/Parser.cpp + sfizz/Opcode.cpp + sfizz/OpcodeCleanup.cpp + sfizz/SfzHelpers.cpp + sfizz/parser/Parser.cpp + sfizz/parser/ParserPrivate.cpp) + +set (SFIZZ_PARSER_OTHER sfizz/OpcodeCleanup.re) +source_group ("Other Files" FILES ${SFIZZ_PARSER_OTHER}) + add_library (sfizz_parser STATIC) target_sources (sfizz_parser PRIVATE - sfizz/Parser.cpp sfizz/Opcode.cpp sfizz/OpcodeCleanup.cpp sfizz/SfzHelpers.cpp - sfizz/parser/Parser.cpp sfizz/parser/ParserPrivate.cpp) + ${SFIZZ_PARSER_HEADERS} ${SFIZZ_PARSER_SOURCES} ${SFIZZ_PARSER_OTHER}) target_include_directories (sfizz_parser PUBLIC sfizz) target_include_directories (sfizz_parser PUBLIC external) target_link_libraries (sfizz_parser PUBLIC absl::strings PRIVATE absl::flat_hash_map) # Sfizz static library add_library(sfizz_static STATIC) -target_sources(sfizz_static PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) +target_sources(sfizz_static PRIVATE + ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) target_include_directories (sfizz_static PUBLIC .) target_include_directories (sfizz_static PUBLIC external) target_link_libraries (sfizz_static PUBLIC absl::strings absl::span) @@ -98,7 +199,8 @@ add_library (sfizz::sfizz ALIAS sfizz_static) # Shared library and installation target if (SFIZZ_SHARED) add_library (sfizz_shared SHARED) - target_sources(sfizz_shared PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) + target_sources(sfizz_shared PRIVATE + ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) target_include_directories (sfizz_shared PRIVATE .) target_include_directories (sfizz_shared PRIVATE external) target_link_libraries (sfizz_shared PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads sfizz-sndfile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-atomic) diff --git a/vst/CMakeLists.txt b/vst/CMakeLists.txt index e3430eb1..6b79b0b4 100644 --- a/vst/CMakeLists.txt +++ b/vst/CMakeLists.txt @@ -21,10 +21,19 @@ set(VSTPLUGIN_SOURCES VstPluginFactory.cpp X11RunLoop.cpp) +set(VSTPLUGIN_HEADERS + SfizzVstProcessor.h + SfizzVstController.h + SfizzVstEditor.h + SfizzVstState.h + GUIComponents.h + X11RunLoop.h) + set(VSTPLUGIN_RESOURCES logo.png) add_library(${VSTPLUGIN_PRJ_NAME} MODULE + ${VSTPLUGIN_HEADERS} ${VSTPLUGIN_SOURCES}) if(WIN32) @@ -42,8 +51,14 @@ plugin_add_vst3sdk(${VSTPLUGIN_PRJ_NAME}) plugin_add_vstgui(${VSTPLUGIN_PRJ_NAME}) # Add the ring buffer +set (HEADER_FILES + "external/ring_buffer/ring_buffer/ring_buffer.h" + "external/ring_buffer/ring_buffer/ring_buffer.tcc") +source_group ("Header Files" FILES ${HEADER_FILES}) target_include_directories(${VSTPLUGIN_PRJ_NAME} PRIVATE "external/ring_buffer") -target_sources(${VSTPLUGIN_PRJ_NAME} PRIVATE "external/ring_buffer/ring_buffer/ring_buffer.cpp") +target_sources(${VSTPLUGIN_PRJ_NAME} PRIVATE + "external/ring_buffer/ring_buffer/ring_buffer.cpp" + ${HEADER_FILES}) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries(${VSTPLUGIN_PRJ_NAME} PRIVATE From 962176e1ebeb223a087ef109fd36351dc3f108a2 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 5 Jul 2020 22:58:34 +0200 Subject: [PATCH 3/7] Added Faust and hpp impl files to src/CMakeLists.txt --- src/CMakeLists.txt | 12 ++++++++++-- src/sfizz/SfzFilter.cpp | 2 +- src/sfizz/{SfzFilterImpls.cxx => SfzFilterImpls.hpp} | 0 3 files changed, 11 insertions(+), 3 deletions(-) rename src/sfizz/{SfzFilterImpls.cxx => SfzFilterImpls.hpp} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08bade62..8de6d8eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,6 +3,13 @@ include (GNUInstallDirs) add_subdirectory(external/kiss_fft) add_subdirectory(external/cpuid) +set (FAUST_FILES + sfizz/dsp/filters/filters_modulable.dsp + sfizz/dsp/filters/rbj_filters.dsp + sfizz/dsp/filters/sallenkey_modulable.dsp + sfizz/dsp/filters/sfz_filters.dsp) +source_group ("Faust Files" FILES ${FAUST_FILES}) + set (SFIZZ_HEADERS sfizz/ADSREnvelope.h sfizz/AudioBuffer.h @@ -62,6 +69,7 @@ set (SFIZZ_HEADERS sfizz/RTSemaphore.h sfizz/ScopedFTZ.h sfizz/SfzFilter.h + sfizz/SfzFilterImpls.hpp sfizz/simd/Common.h sfizz/simd/HelpersAVX.h sfizz/simd/HelpersScalar.h @@ -161,7 +169,7 @@ target_link_libraries (sfizz_parser PUBLIC absl::strings PRIVATE absl::flat_hash # Sfizz static library add_library(sfizz_static STATIC) target_sources(sfizz_static PRIVATE - ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) + ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) target_include_directories (sfizz_static PUBLIC .) target_include_directories (sfizz_static PUBLIC external) target_link_libraries (sfizz_static PUBLIC absl::strings absl::span) @@ -200,7 +208,7 @@ add_library (sfizz::sfizz ALIAS sfizz_static) if (SFIZZ_SHARED) add_library (sfizz_shared SHARED) target_sources(sfizz_shared PRIVATE - ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) + ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) target_include_directories (sfizz_shared PRIVATE .) target_include_directories (sfizz_shared PRIVATE external) target_link_libraries (sfizz_shared PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads sfizz-sndfile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-atomic) diff --git a/src/sfizz/SfzFilter.cpp b/src/sfizz/SfzFilter.cpp index 4746326e..039dddb2 100644 --- a/src/sfizz/SfzFilter.cpp +++ b/src/sfizz/SfzFilter.cpp @@ -6,7 +6,7 @@ #include "Config.h" #include "SfzFilter.h" -#include "SfzFilterImpls.cxx" +#include "SfzFilterImpls.hpp" #include "StringViewHelpers.h" #include #include "SIMDHelpers.h" diff --git a/src/sfizz/SfzFilterImpls.cxx b/src/sfizz/SfzFilterImpls.hpp similarity index 100% rename from src/sfizz/SfzFilterImpls.cxx rename to src/sfizz/SfzFilterImpls.hpp From efabd2dfab5554b8b608d766f585cabb04ac937c Mon Sep 17 00:00:00 2001 From: redtide Date: Mon, 6 Jul 2020 00:26:45 +0200 Subject: [PATCH 4/7] Rename ringbuffer headers --- vst/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vst/CMakeLists.txt b/vst/CMakeLists.txt index 6b79b0b4..0c14922d 100644 --- a/vst/CMakeLists.txt +++ b/vst/CMakeLists.txt @@ -51,14 +51,14 @@ plugin_add_vst3sdk(${VSTPLUGIN_PRJ_NAME}) plugin_add_vstgui(${VSTPLUGIN_PRJ_NAME}) # Add the ring buffer -set (HEADER_FILES +set (RINGBUFFER_HEADERS "external/ring_buffer/ring_buffer/ring_buffer.h" "external/ring_buffer/ring_buffer/ring_buffer.tcc") -source_group ("Header Files" FILES ${HEADER_FILES}) +source_group ("Header Files" FILES ${RINGBUFFER_HEADERS}) target_include_directories(${VSTPLUGIN_PRJ_NAME} PRIVATE "external/ring_buffer") target_sources(${VSTPLUGIN_PRJ_NAME} PRIVATE "external/ring_buffer/ring_buffer/ring_buffer.cpp" - ${HEADER_FILES}) + ${RINGBUFFER_HEADERS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries(${VSTPLUGIN_PRJ_NAME} PRIVATE From 0a328068b280849f80f34a134009c3aef78e2732 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 5 Jul 2020 23:33:43 +0200 Subject: [PATCH 5/7] Don't require an explicit hikey/key=-1 to trigger on CC --- src/sfizz/Region.cpp | 17 +++++++++++++---- tests/RegionTriggersT.cpp | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index bbfd5e8e..bef70718 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -186,6 +186,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) break; // Region logic: key mapping case hash("lokey"): + triggerOnCC = false; setRangeStartFromOpcode(opcode, keyRange, Default::keyRange); break; case hash("hikey"): @@ -334,26 +335,34 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) case hash("start_locc&"): // also on_locc& if (opcode.parameters.back() >= config::numCCs) return false; - if (auto value = readOpcode(opcode.value, Default::midi7Range)) + if (auto value = readOpcode(opcode.value, Default::midi7Range)) { + triggerOnCC = true; ccTriggers[opcode.parameters.back()].setStart(normalizeCC(*value)); + } break; case hash("start_hicc&"): // also on_hicc& if (opcode.parameters.back() >= config::numCCs) return false; - if (auto value = readOpcode(opcode.value, Default::midi7Range)) + if (auto value = readOpcode(opcode.value, Default::midi7Range)) { + triggerOnCC = true; ccTriggers[opcode.parameters.back()].setEnd(normalizeCC(*value)); + } break; case hash("start_lohdcc&"): // also on_lohdcc& if (opcode.parameters.back() >= config::numCCs) return false; - if (auto value = readOpcode(opcode.value, Default::normalizedRange)) + if (auto value = readOpcode(opcode.value, Default::normalizedRange)) { + triggerOnCC = true; 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::normalizedRange)) + if (auto value = readOpcode(opcode.value, Default::normalizedRange)) { + triggerOnCC = true; ccTriggers[opcode.parameters.back()].setEnd(*value); + } break; // Performance parameters: amplifier diff --git a/tests/RegionTriggersT.cpp b/tests/RegionTriggersT.cpp index 4ee56cde..4c567a52 100644 --- a/tests/RegionTriggersT.cpp +++ b/tests/RegionTriggersT.cpp @@ -114,8 +114,8 @@ TEST_CASE("Basic triggers", "Region triggers") region.parseOpcode({ "on_locc47", "64" }); region.parseOpcode({ "on_hicc47", "68" }); REQUIRE(!region.registerCC(47, 63_norm)); - REQUIRE(!region.registerCC(47, 64_norm)); - REQUIRE(!region.registerCC(47, 65_norm)); + REQUIRE(region.registerCC(47, 64_norm)); + REQUIRE(region.registerCC(47, 65_norm)); region.parseOpcode({ "hikey", "-1" }); REQUIRE(region.registerCC(47, 64_norm)); REQUIRE(region.registerCC(47, 65_norm)); From b46b30f35d984b0414cdd1fd9bcf46241679480d Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 6 Jul 2020 00:00:30 +0200 Subject: [PATCH 6/7] Use the pitch keycenter for cc triggers --- src/sfizz/Voice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp index 4f23fd5d..144b680d 100644 --- a/src/sfizz/Voice.cpp +++ b/src/sfizz/Voice.cpp @@ -34,6 +34,9 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, float value, { ASSERT(value >= 0.0f && value <= 1.0f); + if (triggerType == TriggerType::CC) + number = region->pitchKeycenter; + this->triggerType = triggerType; triggerNumber = number; triggerValue = value; From cda4ae2db38ab926302626261648d60c74d6cec1 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 6 Jul 2020 09:03:06 +0200 Subject: [PATCH 7/7] Triggering on note or CC is not exclusive --- src/sfizz/Region.cpp | 10 +++++----- src/sfizz/Region.h | 1 + tests/RegionTriggersT.cpp | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index bef70718..205ed9f4 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -186,15 +186,15 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) break; // Region logic: key mapping case hash("lokey"): - triggerOnCC = false; + triggerOnNote = true; setRangeStartFromOpcode(opcode, keyRange, Default::keyRange); break; case hash("hikey"): - triggerOnCC = (opcode.value == "-1"); + triggerOnNote = (opcode.value != "-1"); setRangeEndFromOpcode(opcode, keyRange, Default::keyRange); break; case hash("key"): - triggerOnCC = (opcode.value == "-1"); + triggerOnNote = (opcode.value != "-1"); setRangeStartFromOpcode(opcode, keyRange, Default::keyRange); setRangeEndFromOpcode(opcode, keyRange, Default::keyRange); setValueFromOpcode(opcode, pitchKeycenter, Default::keyRange); @@ -996,7 +996,7 @@ bool sfz::Region::registerNoteOn(int noteNumber, float velocity, float randValue if (!isSwitchedOn()) return false; - if (triggerOnCC) + if (!triggerOnNote) return false; if (previousNote && !(previousKeySwitched && noteNumber != *previousNote)) @@ -1028,7 +1028,7 @@ bool sfz::Region::registerNoteOff(int noteNumber, float velocity, float randValu if (!isSwitchedOn()) return false; - if (triggerOnCC) + if (!triggerOnNote) return false; const bool velOk = velocityRange.containsWithEnd(velocity); diff --git a/src/sfizz/Region.h b/src/sfizz/Region.h index e96ebe0f..ea8ebcdb 100644 --- a/src/sfizz/Region.h +++ b/src/sfizz/Region.h @@ -381,6 +381,7 @@ private: bool aftertouchSwitched { true }; std::bitset ccSwitched; bool triggerOnCC { false }; + bool triggerOnNote { true }; absl::string_view defaultPath { "" }; int sequenceCounter { 0 }; diff --git a/tests/RegionTriggersT.cpp b/tests/RegionTriggersT.cpp index 4c567a52..0226f263 100644 --- a/tests/RegionTriggersT.cpp +++ b/tests/RegionTriggersT.cpp @@ -125,6 +125,40 @@ TEST_CASE("Basic triggers", "Region triggers") REQUIRE(!region.registerCC(47, 69_norm)); REQUIRE(!region.registerCC(40, 64_norm)); } + + SECTION("on_loccN does not disable key triggering") + { + region.parseOpcode({ "sample", "*sine" }); + region.parseOpcode({ "on_locc1", "127" }); + region.parseOpcode({ "on_hicc1", "127" }); + REQUIRE(!region.registerCC(1, 126_norm)); + REQUIRE(!region.registerCC(2, 127_norm)); + REQUIRE(region.registerCC(1, 127_norm)); + REQUIRE(region.registerNoteOn(64, 127_norm, 0.5f)); + } + + SECTION("on_loccN does not disable key triggering, but adding key=-1 does") + { + region.parseOpcode({ "sample", "*sine" }); + region.parseOpcode({ "on_locc1", "127" }); + region.parseOpcode({ "on_hicc1", "127" }); + region.parseOpcode({ "key", "-1" }); + REQUIRE(!region.registerCC(1, 126_norm)); + REQUIRE(region.registerCC(1, 127_norm)); + REQUIRE(!region.registerNoteOn(64, 127_norm, 0.5f)); + } + + SECTION("on_loccN does not disable key triggering, but adding hikey=-1 does") + { + region.parseOpcode({ "sample", "*sine" }); + region.parseOpcode({ "on_locc1", "127" }); + region.parseOpcode({ "on_hicc1", "127" }); + region.parseOpcode({ "hikey", "-1" }); + REQUIRE(!region.registerCC(1, 126_norm)); + REQUIRE(!region.registerCC(2, 127_norm)); + REQUIRE(region.registerCC(1, 127_norm)); + REQUIRE(!region.registerNoteOn(64, 127_norm, 0.5f)); + } } TEST_CASE("Legato triggers", "Region triggers")