From bdf3f64b28987dceb773582c56b9c58cab473b35 Mon Sep 17 00:00:00 2001 From: paulfd Date: Thu, 29 Aug 2019 15:35:12 +0200 Subject: [PATCH] Forgot to handle control and global opcodes in the synth --- CMakeLists.txt | 2 +- external/spdlog | 1 + sources/Synth.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 160000 external/spdlog diff --git a/CMakeLists.txt b/CMakeLists.txt index 29686524..8030a21b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,7 @@ add_executable(sfizz_tests ${TEST_SOURCES} ${COMMON_SOURCES}) if(UNIX) target_link_libraries(sfizz_tests stdc++fs) endif(UNIX) -target_link_libraries(sfizz_tests Catch2::Catch2 absl::strings absl::flat_hash_map sndfile readerwriterqueue cnpy-static absl::span absl::algorithm) +target_link_libraries(sfizz_tests Catch2::Catch2 absl::strings absl::str_format absl::flat_hash_map sndfile readerwriterqueue cnpy-static absl::span absl::algorithm) target_include_directories(sfizz_tests SYSTEM PRIVATE sources) file(COPY "tests" DESTINATION ${CMAKE_BINARY_DIR}) diff --git a/external/spdlog b/external/spdlog new file mode 160000 index 00000000..139c0d13 --- /dev/null +++ b/external/spdlog @@ -0,0 +1 @@ +Subproject commit 139c0d135f303946bd542a9bc2d6b18d6a7415bb diff --git a/sources/Synth.cpp b/sources/Synth.cpp index 591de443..4544ff84 100644 --- a/sources/Synth.cpp +++ b/sources/Synth.cpp @@ -17,12 +17,14 @@ void sfz::Synth::callback(std::string_view header, const std::vector& me // We shouldn't have multiple global headers in file ASSERT(!hasGlobal); globalOpcodes = members; + handleGlobalOpcodes(members); hasGlobal = true; break; case hash("control"): // We shouldn't have multiple control headers in file ASSERT(!hasControl) hasControl = true; + handleControlOpcodes(members); break; case hash("master"): masterOpcodes = members;