More work

plugins/core-plugin.cc

@@ -174,6 +174,7 @@ namespace clap {
  guiDefineParameters();
  guiDefineTrackInfo();
  guiSubscribeUndo();
+ guiPopulateProperties();
 
  auto skinPath = _pathProvider->getQmlSkinPath();
  _guiHandle->gui().addImportPath(_pathProvider->getQmlLibraryPath());

plugins/core-plugin.hh

@@ -54,6 +54,8 @@ namespace clap {
  const TuningProvider &tuningProvider() const noexcept { return _tuningProvider; }
 
  protected:
+ bool enableDraftExtensions() const noexcept override { return true; }
+
  //-------------//
  // clap_plugin //
  //-------------//
@@ -152,7 +154,7 @@ namespace clap {
  bool stateLoad(const clap_istream *stream) noexcept override;
 
  virtual std::vector<uint8_t> stateSaveExtra() noexcept { return {}; }
- virtual bool stateLoadExtra(const std::vector<uint8_t>& data) noexcept { return true; }
+ virtual bool stateLoadExtra(const std::vector<uint8_t> &data) noexcept { return true; }
 
 #ifndef CLAP_PLUGINS_HEADLESS
  //-----------------//
@@ -174,6 +176,7 @@ namespace clap {
  void guiDefineParameters();
  void guiSubscribeUndo();
  void guiUnsubscribeUndo();
+ virtual void guiPopulateProperties() {}
 
  //---------------------//
  // AbstractGuiListener //

plugins/gui/abstract-gui.hh

@@ -3,19 +3,24 @@
 #include <clap/clap.h>
 
 #include <string>
+#include <variant>
 
 namespace clap {
 
  class CorePlugin;
  class AbstractGuiListener;
  class AbstractGui {
  public:
+ using PropertyValue = std::variant<bool, int64_t, double, std::string>;
+
  AbstractGui(AbstractGuiListener &listener);
  virtual ~AbstractGui();
 
  virtual void addImportPath(const std::string& importPath) = 0;
  virtual void setSkin(const std::string& skinUrl) = 0;
 
+ virtual void setGuiProperty(const std::string& name, const PropertyValue& value) = 0;
+
  virtual void defineParameter(const clap_param_info &paramInfo) = 0;
  virtual void updateParameter(clap_id paramId, double value, double modAmount) = 0;
  virtual void setParameterMappingIndication(clap_id paramId, bool hasIndication, clap_color color, const char *label, const char *description) = 0;

plugins/gui/gui.cc

@@ -55,6 +55,11 @@ namespace clap {
  _quickView->setSource(QUrl(skinUrl.c_str()));
  }
 
+ void Gui::setGuiProperty(const std::string &name, const PropertyValue &value)
+ {
+ _pluginProxy->setGuiProperty(name, value);
+ }
+
  void Gui::defineParameter(const clap_param_info &paramInfo) {
  qDebug() << "clap-gui: defineParam(" << paramInfo.id << ")";
  _pluginProxy->defineParameter(paramInfo);

plugins/gui/gui.hh

@@ -35,6 +35,8 @@ namespace clap {
  void addImportPath(const std::string &importPath) override;
  void setSkin(const std::string &skinPath) override;
 
+ void setGuiProperty(const std::string &name, const PropertyValue &value) override;
+
  void defineParameter(const clap_param_info &paramInfo) override;
  void updateParameter(clap_id paramId, double value, double modAmount) override;
  void setParameterMappingIndication(clap_id paramId,

plugins/gui/plugin-proxy.cc

@@ -1,7 +1,9 @@
-#include "plugin-proxy.hh"
+#include <variant>
+
 #include "../modules/module.hh"
 #include "abstract-gui-listener.hh"
 #include "gui.hh"
+#include "plugin-proxy.hh"
 
 namespace clap {
  PluginProxy::PluginProxy(Gui &client) : super(&client), _client(client) {}
@@ -46,4 +48,15 @@ namespace clap {
  }
  _client.guiListener().onGuiInvoke(method.toStdString(), targetArgs);
  }
+
+ void PluginProxy::setGuiProperty(const std::string &name,
+ const AbstractGui::PropertyValue &value) {
+ const auto qname = QString::fromStdString(name);
+ const auto qvalue = QVariant::fromStdVariant(value);
+
+ _properties.insert(qname, qvalue);
+ guiPropertiesChanged();
+ }
+
+ const QVariantMap &PluginProxy::guiProperties() const noexcept { return _properties; }
 } // namespace clap

plugins/gui/plugin-proxy.hh

@@ -3,9 +3,11 @@
 #include <unordered_map>
 
 #include <QObject>
+#include <QVariantMap>
 
 #include <clap/clap.h>
 
+#include "abstract-gui.hh"
 #include "parameter-proxy.hh"
 
 namespace clap {
@@ -16,9 +18,17 @@ namespace clap {
 
  Q_OBJECT
 
+ Q_PROPERTY(QVariantMap props READ guiProperties NOTIFY guiPropertiesChanged)
+
+ signals:
+ void guiPropertiesChanged();
+
  public:
  explicit PluginProxy(Gui &client);
 
+ void setGuiProperty(const std::string &name, const AbstractGui::PropertyValue &value);
+ const QVariantMap &guiProperties() const noexcept;
+
  void defineParameter(const clap_param_info &info);
 
  Q_INVOKABLE ParameterProxy *param(clap_id paramId);
@@ -30,6 +40,8 @@ namespace clap {
  private:
  Gui &_client;
  std::unordered_map<clap_id, ParameterProxy *> _parameters;
+
+ QVariantMap _properties;
  };
 
 } // namespace clap

plugins/gui/qml/clap/skins/undo-test/main.qml

@@ -35,5 +35,8 @@ Rectangle {
  text: "Do something"
  onClicked: plugin.invoke("incrementState")
  }
+ Text {
+ text: plugin.props["counter"]
+ }
  }
 }

plugins/gui/threaded-gui-proxy.cc

@@ -21,6 +21,11 @@ namespace clap {
  _gui.get(), [=, this] { _gui->setSkin(skinUrl); }, Qt::QueuedConnection);
  }
 
+ void ThreadedGuiProxy::setGuiProperty(const std::string &name, const PropertyValue &value) {
+ QMetaObject::invokeMethod(
+ _gui.get(), [=, this] { _gui->setGuiProperty(name, value); }, Qt::QueuedConnection);
+ }
+
  void ThreadedGuiProxy::defineParameter(const clap_param_info &paramInfo) {
  QMetaObject::invokeMethod(
  _gui.get(), [=, this] { _gui->defineParameter(paramInfo); }, Qt::QueuedConnection);

plugins/gui/threaded-gui-proxy.hh

@@ -8,14 +8,16 @@ namespace clap {
 
  class Gui;
 
- class ThreadedGuiProxy : public AbstractGui {
+ class ThreadedGuiProxy final : public AbstractGui {
  public:
  ThreadedGuiProxy(AbstractGuiListener &listener, std::shared_ptr<Gui> &guiClient);
  ~ThreadedGuiProxy() override;
 
  void addImportPath(const std::string &importPath) override;
  void setSkin(const std::string &skinUrl) override;
 
+ void setGuiProperty(const std::string &name, const PropertyValue &value) override;
+
  void defineParameter(const clap_param_info &paramInfo) override;
  void updateParameter(clap_id paramId, double value, double modAmount) override;
  void setParameterMappingIndication(clap_id paramId,

plugins/plugs/undo-test/undo-test.hh

@@ -27,6 +27,8 @@ namespace clap {
  bool undoRedo(clap_id format_version, const void *delta, size_t delta_size) noexcept override;
 
  void incrementState();
+ void notifyGuiStateProperties();
+ void guiPopulateProperties() override;
 
 #ifndef CLAP_PLUGINS_HEADLESS
  void onGuiInvoke(
@@ -35,6 +37,6 @@ namespace clap {
 #endif
 
  private:
- uint32_t _state{0};
+ uint32_t _counter{0};
  };
 } // namespace clap

plugins/plugs/undo-test/undo-test.hxx

@@ -1,5 +1,7 @@
 #include <cstring>
 
+#include "../gui/abstract-gui.hh"
+#include "../gui/gui-handle.hh"
 #include "undo-test.hh"
 
 namespace clap {
@@ -94,10 +96,12 @@ namespace clap {
  auto undoDelta = static_cast<const UndoDelta *>(delta);
 
  char buffer[128];
- snprintf(buffer, sizeof(buffer), "UNDO undo %d -> %d", _state, undoDelta->old_value);
+ snprintf(buffer, sizeof(buffer), "UNDO undo %d -> %d", _counter, undoDelta->old_value);
  _host.log(CLAP_LOG_INFO, buffer);
 
- _state = undoDelta->old_value;
+ _counter = undoDelta->old_value;
+
+ notifyGuiStateProperties();
  return true;
  }
 
@@ -121,10 +125,12 @@ namespace clap {
  auto undoDelta = static_cast<const UndoDelta *>(delta);
 
  char buffer[128];
- snprintf(buffer, sizeof(buffer), "UNDO redo %d -> %d", _state, undoDelta->new_value);
+ snprintf(buffer, sizeof(buffer), "UNDO redo %d -> %d", _counter, undoDelta->new_value);
  _host.log(CLAP_LOG_INFO, buffer);
 
- _state = undoDelta->new_value;
+ _counter = undoDelta->new_value;
+
+ notifyGuiStateProperties();
  return true;
  }
 
@@ -134,8 +140,8 @@ namespace clap {
  return;
 
  UndoDelta delta;
- delta.old_value = _state;
- delta.new_value = ++_state;
+ delta.old_value = _counter;
+ delta.new_value = ++_counter;
 
  char buffer[128];
  snprintf(buffer, sizeof(buffer), "UNDO increment %d -> %d", delta.old_value, delta.new_value);
@@ -145,6 +151,8 @@ namespace clap {
  _host.undoChangeMade(buffer, &delta, sizeof(delta), true);
  else
  _host.undoChangeMade(buffer, nullptr, 0, 0);
+
+ notifyGuiStateProperties();
  }
 
  template <bool hasDelta, bool areDeltasPersistant>
@@ -168,19 +176,33 @@ namespace clap {
  else
  super::onGuiInvoke(method, args);
  }
+
+ template <bool hasDelta, bool areDeltasPersistant>
+ void UndoTest<hasDelta, areDeltasPersistant>::guiPopulateProperties() {
+ super::guiPopulateProperties();
+ notifyGuiStateProperties();
+ }
 #endif
 
+ template <bool hasDelta, bool areDeltasPersistant>
+ void UndoTest<hasDelta, areDeltasPersistant>::notifyGuiStateProperties() {
+#ifndef CLAP_PLUGINS_HEADLESS
+ if (_guiHandle)
+ _guiHandle->gui().setGuiProperty("counter", _counter);
+#endif
+ }
+
  template <bool hasDelta, bool areDeltasPersistant>
  std::vector<uint8_t> UndoTest<hasDelta, areDeltasPersistant>::stateSaveExtra() noexcept {
- return std::vector<uint8_t>((const uint8_t *)&_state, (const uint8_t *)(&_state + 1));
+ return std::vector<uint8_t>((const uint8_t *)&_counter, (const uint8_t *)(&_counter + 1));
  }
 
  template <bool hasDelta, bool areDeltasPersistant>
  bool UndoTest<hasDelta, areDeltasPersistant>::stateLoadExtra(
  const std::vector<uint8_t> &data) noexcept {
- if (data.size() != sizeof(_state))
+ if (data.size() != sizeof(_counter))
  return false;
- _state = *(const uint32_t *)data.data();
+ _counter = *(const uint32_t *)data.data();
  return true;
  }