From 0bdebebfae16380779657af779db44eaa8baff93 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 23 Nov 2021 00:24:03 -0500 Subject: [PATCH 1/2] Make Engine_updateExpander() non-locking. --- src/engine/Engine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index d473fd61..e7279f7c 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -289,13 +289,13 @@ struct Engine::Internal { }; -static void Engine_updateExpander(Engine* that, Module* module, bool side) { +static void Engine_updateExpander_NoLock(Engine* that, Module* module, bool side) { Module::Expander& expander = side ? module->rightExpander : module->leftExpander; Module* oldExpanderModule = expander.module; if (expander.moduleId >= 0) { if (!expander.module || expander.module->id != expander.moduleId) { - expander.module = that->getModule(expander.moduleId); + expander.module = that->getModule_NoLock(expander.moduleId); } } else { @@ -592,8 +592,8 @@ void Engine::stepBlock(int frames) { // Update expander pointers for (Module* module : internal->modules) { - Engine_updateExpander(this, module, false); - Engine_updateExpander(this, module, true); + Engine_updateExpander_NoLock(this, module, false); + Engine_updateExpander_NoLock(this, module, true); } // Launch workers From e96859405e47d484579f3876c3d3d7da9268acf4 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 23 Nov 2021 00:55:58 -0500 Subject: [PATCH 2/2] Remove Mac menu bar items, since they are redundant to Rack's menu bar. --- src/window/Window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 895a6214..a7e1bcb3 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -750,7 +750,7 @@ void init() { // Set up GLFW #if defined ARCH_MAC glfwInitHint(GLFW_COCOA_CHDIR_RESOURCES, GLFW_TRUE); - glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_TRUE); + glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE); #endif glfwSetErrorCallback(errorCallback);