brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt at creating widget before loading state

Browse source
This commit is contained in:
falkTX 2021-11-15 19:35:33 +00:00
parent acc99bef1c
commit 41dddc3bb1
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -31,6 +31,8 @@
# include "ImGuiWidget.hpp" # include "ImGuiWidget.hpp"
# include "extra/ScopedPointer.hpp" # include "extra/ScopedPointer.hpp"
# include "extra/Thread.hpp" # include "extra/Thread.hpp"
#else
# include "extra/Mutex.hpp"
#endif #endif
#include "CarlaNativePlugin.h" #include "CarlaNativePlugin.h"
@ -674,15 +676,15 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
{ {
if (module->fCarlaHostHandle != nullptr) if (module->fCarlaHostHandle != nullptr)
{ {
module->fUI = nullptr; if (idleCallbackActive)
module->pcontext->removeIdleCallback(this);
if (fPluginRunning) if (fPluginRunning)
carla_show_custom_ui(module->fCarlaHostHandle, 0, false); carla_show_custom_ui(module->fCarlaHostHandle, 0, false);
carla_set_engine_option(module->fCarlaHostHandle, ENGINE_OPTION_FRONTEND_WIN_ID, 0, "0"); carla_set_engine_option(module->fCarlaHostHandle, ENGINE_OPTION_FRONTEND_WIN_ID, 0, "0");
if (idleCallbackActive) module->fUI = nullptr;
module->pcontext->removeIdleCallback(this);
} }
if (isThreadRunning()) if (isThreadRunning())

1
src/Makefile
View file

@ -121,6 +121,7 @@ RACK_FILES += $(filter-out $(IGNORED_FILES), $(wildcard Rack/src/*/*.cpp))
# -------------------------------------------------------------- # --------------------------------------------------------------
# lots of warnings from VCV side # lots of warnings from VCV side
BASE_FLAGS += -Wno-unknown-warning-option
BASE_FLAGS += -Wno-unused-but-set-variable BASE_FLAGS += -Wno-unused-but-set-variable
BASE_FLAGS += -Wno-unused-parameter BASE_FLAGS += -Wno-unused-parameter
BASE_FLAGS += -Wno-unused-result BASE_FLAGS += -Wno-unused-result

14
src/override/Engine.cpp
View file

@ -41,6 +41,7 @@
#include <random.hpp> #include <random.hpp>
#include <patch.hpp> #include <patch.hpp>
#include <plugin.hpp> #include <plugin.hpp>
#include <helpers.hpp>
#ifdef NDEBUG #ifdef NDEBUG
# undef DEBUG # undef DEBUG
@ -585,6 +586,9 @@ void Engine::removeModule_NoLock(Module* module) {
m->rightExpander.module = NULL; m->rightExpander.module = NULL;
} }
} }
// Remove from widgets cache
if (auto* const helper = reinterpret_cast<CardinalPluginModelHelper*>(module->model))
helper->clearCachedModuleWidget(module);
// Remove module // Remove module
internal->modulesCache.erase(module->id); internal->modulesCache.erase(module->id);
internal->modules.erase(it); internal->modules.erase(it);
@ -981,8 +985,14 @@ void Engine::fromJson(json_t* rootJ) {
} }
// Create module // Create module
Module* module = model->createModule(); Module* const module = model->createModule();
DISTRHO_SAFE_ASSERT_RETURN(module,); DISTRHO_SAFE_ASSERT_CONTINUE(module != nullptr);
// Create the widget too, needed by a few modules
auto* const helper = reinterpret_cast<CardinalPluginModelHelper*>(model);
DISTRHO_SAFE_ASSERT_CONTINUE(helper != nullptr);
helper->createCachedModuleWidget(module);
try { try {
// This doesn't need a lock because the Module is not added to the Engine yet. // This doesn't need a lock because the Module is not added to the Engine yet.