diff --git a/3rdparty/libremidi b/3rdparty/libremidi index cb831c11956..4951b6a389f 160000 --- a/3rdparty/libremidi +++ b/3rdparty/libremidi @@ -1 +1 @@ -Subproject commit cb831c11956833e0244684dbe113338266dc8b8b +Subproject commit 4951b6a389f008ad6e27fedd399bdc399a29706e diff --git a/cmake/OssiaOptions.cmake b/cmake/OssiaOptions.cmake index 4fd9e5c96a8..6b9f4afc1f7 100644 --- a/cmake/OssiaOptions.cmake +++ b/cmake/OssiaOptions.cmake @@ -365,7 +365,7 @@ function(ossia_add_test TESTNAME TESTSRCS) target_compile_definitions(ossia_${TESTNAME} PUBLIC CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) endif() target_include_directories(ossia_${TESTNAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/catch") - target_link_libraries(ossia_${TESTNAME} PUBLIC ${OSSIA_LINK_OPTIONS} ossia PRIVATE Catch2::Catch2WithMain) + target_link_libraries(ossia_${TESTNAME} PUBLIC ${OSSIA_LINK_OPTIONS} ossia Catch2::Catch2WithMain) add_test(NAME ossia_target_${TESTNAME} COMMAND ossia_${TESTNAME}) endFunction() diff --git a/src/ossia/audio/audio_engine.cpp b/src/ossia/audio/audio_engine.cpp index a830ac5972e..f2ad44e3a87 100644 --- a/src/ossia/audio/audio_engine.cpp +++ b/src/ossia/audio/audio_engine.cpp @@ -214,6 +214,14 @@ ossia::audio_engine* make_audio_engine( p = new ossia::dummy_engine{rate, bs}; } + if(p) + { + inputs = p->effective_inputs; + outputs = p->effective_outputs; + rate = p->effective_sample_rate; + bs = p->effective_buffer_size; + } + return p; }