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

Merge branch 'develop' into release-key

Browse source
This commit is contained in:
Paul Ferrand 2020-07-06 10:08:40 +02:00 • committed by GitHub
commit 9dc12187bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 209 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/CMakeLists.txt
View file

@ -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)

2
devtools/CMakeLists.txt
View file

@ -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)

8
lv2/CMakeLists.txt
View file

@ -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

7
lv2/sfizz.c
View file

@ -46,6 +46,7 @@
#include <lv2/worker/worker.h>
#include <lv2/log/logger.h>
#include <lv2/log/log.h>
#include <lv2/time/time.h>
#include <ardour/lv2_extensions.h>
@ -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");

118
src/CMakeLists.txt
View file

@ -3,6 +3,91 @@ 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
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/SfzFilterImpls.hpp
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 +135,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} ${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)
@ -98,7 +207,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} ${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)

25
src/sfizz/Region.cpp
View file

@ -186,14 +186,15 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
break;
// Region logic: key mapping
case hash("lokey"):
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);
@ -337,26 +338,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
@ -990,7 +999,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))
@ -1022,7 +1031,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);

2
src/sfizz/Region.h
View file

@ -371,6 +371,8 @@ struct Region {
ModifierArray<CCMap<Modifier>> modifiers;
bool triggerOnCC { false }; // whether the region triggers on CC events or note events
bool triggerOnNote { true };
// Parent
RegionSet* parent { nullptr };
private:

2
src/sfizz/SfzFilter.cpp
View file

@ -6,7 +6,7 @@
#include "Config.h"
#include "SfzFilter.h"
#include "SfzFilterImpls.cxx"
#include "SfzFilterImpls.hpp"
#include "StringViewHelpers.h"
#include <cstring>
#include "SIMDHelpers.h"

0
src/sfizz/SfzFilterImpls.cxx → src/sfizz/SfzFilterImpls.hpp
View file

3
src/sfizz/Voice.cpp
View file

@ -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;

38
tests/RegionTriggersT.cpp
View file

@ -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));
@ -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")

17
vst/CMakeLists.txt
View file

@ -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 (RINGBUFFER_HEADERS
"external/ring_buffer/ring_buffer/ring_buffer.h"
"external/ring_buffer/ring_buffer/ring_buffer.tcc")
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")
target_sources(${VSTPLUGIN_PRJ_NAME} PRIVATE
"external/ring_buffer/ring_buffer/ring_buffer.cpp"
${RINGBUFFER_HEADERS})
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(${VSTPLUGIN_PRJ_NAME} PRIVATE