From 8d942f5a94865f97827a89c5c09ce00186ee5611 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Tue, 17 Oct 2023 10:41:43 +0200 Subject: [PATCH 1/5] Update submodules (clap 1.1.9) --- clap | 2 +- clap-helpers | 2 +- vcpkg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clap b/clap index 41964fa..92d7ebe 160000 --- a/clap +++ b/clap @@ -1 +1 @@ -Subproject commit 41964fa3f44fdbf6feb20df528a9cdf2cc3b05ba +Subproject commit 92d7ebe55dafa47c20b9b5d5543b35abc21c4600 diff --git a/clap-helpers b/clap-helpers index 16c422f..e0a1591 160000 --- a/clap-helpers +++ b/clap-helpers @@ -1 +1 @@ -Subproject commit 16c422f42fa2e2c9f9cda72b2cebbccad372d541 +Subproject commit e0a15917f6586f16a908fda2162be376a01a8812 diff --git a/vcpkg b/vcpkg index 486a464..e57b216 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 486a4640db740f5994e492eb60748111dfc48de7 +Subproject commit e57b2167e66c847f991bd6bce1355b85acd944e8 From 628fcc88d63d8d25852f4d9d3351dc9fd03d29e2 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Wed, 18 Oct 2023 10:33:07 +0200 Subject: [PATCH 2/5] Update submodules --- clap | 2 +- vcpkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clap b/clap index 92d7ebe..b31b26a 160000 --- a/clap +++ b/clap @@ -1 +1 @@ -Subproject commit 92d7ebe55dafa47c20b9b5d5543b35abc21c4600 +Subproject commit b31b26a0a1532115e08dc48b6c5c29519f76573c diff --git a/vcpkg b/vcpkg index e57b216..5c82f7e 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit e57b2167e66c847f991bd6bce1355b85acd944e8 +Subproject commit 5c82f7e6372c9b0ea25e1fd829dd50235ef37629 From 4eea4da08a469fc771bd63d1c3ade576cf4ba104 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Wed, 18 Oct 2023 14:52:52 +0200 Subject: [PATCH 3/5] Some more compilation fixes --- host/plugin-host.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/host/plugin-host.cc b/host/plugin-host.cc index 33539e9..2d2710c 100644 --- a/host/plugin-host.cc +++ b/host/plugin-host.cc @@ -506,7 +506,7 @@ void PluginHost::eventLoopSetFdNotifierFlags(int fd, int flags) { it->second->rd.reset(new QSocketNotifier((qintptr)fd, QSocketNotifier::Read)); QObject::connect(it->second->rd.get(), &QSocketNotifier::activated, [this, fd] { checkForMainThread(); - h->_plugin->posixFdSupportOnFd(fd, CLAP_POSIX_FD_READ); + _plugin->posixFdSupportOnFd(fd, CLAP_POSIX_FD_READ); }); } it->second->rd->setEnabled(true); @@ -518,7 +518,7 @@ void PluginHost::eventLoopSetFdNotifierFlags(int fd, int flags) { it->second->wr.reset(new QSocketNotifier((qintptr)fd, QSocketNotifier::Write)); QObject::connect(it->second->wr.get(), &QSocketNotifier::activated, [this, fd] { checkForMainThread(); - h->_plugin->posixFdSupportOnFd(fd, CLAP_POSIX_FD_WRITE); + _plugin->posixFdSupportOnFd(fd, CLAP_POSIX_FD_WRITE); }); } it->second->wr->setEnabled(true); @@ -921,12 +921,12 @@ void PluginHost::paramsRescan(uint32_t flags) noexcept { } // 2. scan the params. - auto count = _plugin.paramsCount(); + auto count = _plugin->paramsCount(); std::unordered_set paramIds(count * 2); for (int32_t i = 0; i < count; ++i) { clap_param_info info; - if (!_plugin.paramsGetInfo(i, &info)) + if (!_plugin->paramsGetInfo(i, &info)) throw std::logic_error("clap_plugin_params.get_info did return false!"); if (info.id == CLAP_INVALID_ID) { From a6dcc06981b5887102ce126d216059d42b9ed6e2 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Wed, 18 Oct 2023 14:53:01 +0200 Subject: [PATCH 4/5] Update submodules --- clap | 2 +- clap-helpers | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clap b/clap index b31b26a..08d6b5e 160000 --- a/clap +++ b/clap @@ -1 +1 @@ -Subproject commit b31b26a0a1532115e08dc48b6c5c29519f76573c +Subproject commit 08d6b5efab0753838a95b600c90f36e1fffc78fd diff --git a/clap-helpers b/clap-helpers index e0a1591..a69954e 160000 --- a/clap-helpers +++ b/clap-helpers @@ -1 +1 @@ -Subproject commit e0a15917f6586f16a908fda2162be376a01a8812 +Subproject commit a69954e7d4931cc2e5778109d20653c0ca3b72ad From 1aea8bd68ca604494615a964453f5f1d56eb1b36 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Mon, 23 Oct 2023 14:52:45 +0200 Subject: [PATCH 5/5] Update submodules --- clap | 2 +- vcpkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clap b/clap index 08d6b5e..e912f06 160000 --- a/clap +++ b/clap @@ -1 +1 @@ -Subproject commit 08d6b5efab0753838a95b600c90f36e1fffc78fd +Subproject commit e912f0639d6b6ac34f0b8e09e45092375977315b diff --git a/vcpkg b/vcpkg index 5c82f7e..830f86f 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 5c82f7e6372c9b0ea25e1fd829dd50235ef37629 +Subproject commit 830f86fb309ad7167468a433a890b7415fbb90a5