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

Forgot to handle control and global opcodes in the synth

Browse source
This commit is contained in:
paulfd 2019-08-29 15:35:12 +02:00
parent 16bcd21493
commit bdf3f64b28
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -141,7 +141,7 @@ add_executable(sfizz_tests ${TEST_SOURCES} ${COMMON_SOURCES})
if(UNIX) if(UNIX)
target_link_libraries(sfizz_tests stdc++fs) target_link_libraries(sfizz_tests stdc++fs)
endif(UNIX) 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) target_include_directories(sfizz_tests SYSTEM PRIVATE sources)
file(COPY "tests" DESTINATION ${CMAKE_BINARY_DIR}) file(COPY "tests" DESTINATION ${CMAKE_BINARY_DIR})

1
external/spdlog vendored Submodule

@ -0,0 +1 @@
Subproject commit 139c0d135f303946bd542a9bc2d6b18d6a7415bb

2
sources/Synth.cpp
View file

@ -17,12 +17,14 @@ void sfz::Synth::callback(std::string_view header, const std::vector<Opcode>& me
// We shouldn't have multiple global headers in file // We shouldn't have multiple global headers in file
ASSERT(!hasGlobal); ASSERT(!hasGlobal);
globalOpcodes = members; globalOpcodes = members;
handleGlobalOpcodes(members);
hasGlobal = true; hasGlobal = true;
break; break;
case hash("control"): case hash("control"):
// We shouldn't have multiple control headers in file // We shouldn't have multiple control headers in file
ASSERT(!hasControl) ASSERT(!hasControl)
hasControl = true; hasControl = true;
handleControlOpcodes(members);
break; break;
case hash("master"): case hash("master"):
masterOpcodes = members; masterOpcodes = members;