clap

commit b72556cb03ada4f6abc1a7f80240f6afe85b0c0a
parent fae217919260ac3bfbb79e987f1ae46e7121e85e
Author: Alexandre BIQUE <bique.alexandre@gmail.com>
Date:   Fri, 10 Sep 2021 09:00:19 +0200

plugin-host: more checks

Diffstat:
M
examples/host/plugin-host.cc
 | 
62
+++++++++++++++++++++++++++++++++++++++++++++++++-------------
M
examples/host/plugin-host.hh
 | 
2
++

2 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/examples/host/plugin-host.cc b/examples/host/plugin-host.cc
@@ -118,8 +118,8 @@ bool PluginHost::load(const QString &path, int pluginIndex) {
 
    if (!clap_version_is_compatible(desc->clap_version)) {
       qWarning() << "Incompatible clap version: Plugin is: " << desc->clap_version.major << "."
-                 << desc->clap_version.minor << "." << desc->clap_version.revision
-                 << " Host is " << CLAP_VERSION.major << "." << CLAP_VERSION.minor << "." << CLAP_VERSION.revision;
+                 << desc->clap_version.minor << "." << desc->clap_version.revision << " Host is "
+                 << CLAP_VERSION.major << "." << CLAP_VERSION.minor << "." << CLAP_VERSION.revision;
       return false;
    }
 
@@ -165,15 +165,29 @@ void PluginHost::unload() {
    if (!_library.isLoaded())
       return;
 
-   if (_pluginGui)
+   if (_isGuiCreated) {
       _pluginGui->destroy(_plugin);
+      _isGuiCreated = false;
+      _isGuiVisible = false;
+   }
 
    deactivate();
 
    _plugin->destroy(_plugin);
    _plugin = nullptr;
    _pluginGui = nullptr;
+   _pluginGuiX11 = nullptr;
+   _pluginGuiCocoa = nullptr;
+   _pluginGuiWin32 = nullptr;
+   _pluginGuiFreeStanding = nullptr;
+   _pluginTimerSupport = nullptr;
+   _pluginFdSupport = nullptr;
+   _pluginThreadPool = nullptr;
+   _pluginPresetLoad = nullptr;
+   _pluginState = nullptr;
    _pluginAudioPorts = nullptr;
+   _pluginParams = nullptr;
+   _pluginQuickControls = nullptr;
 
    _pluginEntry->deinit();
    _pluginEntry = nullptr;
@@ -235,17 +249,19 @@ void PluginHost::setPorts(int numInputs, float **inputs, int numOutputs, float *
 void PluginHost::setParentWindow(WId parentWindow) {
    checkForMainThread();
 
+   if (!canUsePluginGui())
+      return;
+
    if (_isGuiCreated) {
       _pluginGui->destroy(_plugin);
       _isGuiCreated = false;
       _isGuiVisible = false;
    }
 
-   if (!_pluginGui)
-      return;
-
-   if (!_pluginGui->create(_plugin))
+   if (!_pluginGui->create(_plugin)) {
+      qWarning() << "could not create the plugin gui";
       return;
+   }
 
    _isGuiCreated = true;
    assert(_isGuiVisible == false);
@@ -253,21 +269,34 @@ void PluginHost::setParentWindow(WId parentWindow) {
    uint32_t width = 0;
    uint32_t height = 0;
 
-   if (_pluginGui)
-      _pluginGui->get_size(_plugin, &width, &height);
+   if (!_pluginGui->get_size(_plugin, &width, &height)) {
+      qWarning() << "could not get the size of the plugin gui";
+      _isGuiCreated = false;
+      _pluginGui->destroy(_plugin);
+      return;
+   }
+
+   bool didAttach = false;
 
 #if defined(Q_OS_LINUX)
    if (_pluginGuiX11)
-      _pluginGuiX11->attach(_plugin, nullptr, parentWindow);
+      didAttach = _pluginGuiX11->attach(_plugin, nullptr, parentWindow);
 #elif defined(Q_OS_MACX)
    if (_pluginGuiCocoa)
-      _pluginGuiCocoa->attach(_plugin, (void *)parentWindow);
+      didAttach = _pluginGuiCocoa->attach(_plugin, (void *)parentWindow);
 #elif defined(Q_OS_WIN32)
    if (_pluginEmbedWin32)
-      _pluginGuiWin32->attach(_plugin, parentWindow);
+      didAttach = _pluginGuiWin32->attach(_plugin, parentWindow);
 #endif
    // else (_pluginGuiFreeStanding)
-   //   _pluginGuiFreeStanding->open(_plugin);
+   //   didAttach = _pluginGuiFreeStanding->open(_plugin);
+
+   if (!didAttach) {
+      qWarning() << "the plugin failed to attach its gui";
+      _isGuiCreated = false;
+      _pluginGui->destroy(_plugin);
+      return;
+   }
 
    Application::instance().mainWindow()->resizePluginView(width, height);
 
@@ -1103,3 +1132,9 @@ QString PluginHost::paramValueToText(clap_id paramId, double value) {
 
    return QString::number(value);
 }
+
+bool PluginHost::canUsePluginGui() const noexcept {
+   return _pluginGui && _pluginGui->create && _pluginGui->destroy && _pluginGui->can_resize &&
+          _pluginGui->get_size && _pluginGui->round_size && _pluginGui->round_size &&
+          _pluginGui->set_size && _pluginGui->set_scale && _pluginGui->hide && _pluginGui->show;
+}
+\ No newline at end of file
diff --git a/examples/host/plugin-host.hh b/examples/host/plugin-host.hh
@@ -126,6 +126,8 @@ private:
 
    static void clapStateMarkDirty(const clap_host *host);
 
+   bool canUsePluginGui() const noexcept;
+
 private:
    Engine &_engine;