From: IOhannes m zmölnig Date: Thu, 2 Apr 2020 08:14:12 +0000 (+0200) Subject: Rename JUCE-patch X-Git-Tag: archive/raspbian/0.16.2.2+ds1-1+rpi1^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c73bfd0330827c40a82ba57cefafd16f352b2ab3;p=giada.git Rename JUCE-patch --- diff --git a/debian/patches/0003-JUCE544-compat.patch b/debian/patches/0003-JUCE544-compat.patch deleted file mode 100644 index 38b86e7..0000000 --- a/debian/patches/0003-JUCE544-compat.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= -Date: Tue, 20 Aug 2019 14:38:49 +0200 -Subject: JUCE544 compat - ---- - src/core/plugin.cpp | 6 +++--- - src/core/plugin.h | 4 ++-- - src/core/pluginManager.cpp | 18 ++++++++---------- - 3 files changed, 13 insertions(+), 15 deletions(-) - ---- giada.orig/src/core/plugin.cpp -+++ giada/src/core/plugin.cpp -@@ -54,11 +54,11 @@ - /* -------------------------------------------------------------------------- */ - - --Plugin::Plugin(ID id, juce::AudioPluginInstance* plugin, double samplerate, -+Plugin::Plugin(ID id, std::unique_ptr plugin, double samplerate, - int buffersize) - : id (id), - valid (true), -- m_plugin (plugin), -+ m_plugin (std::move(plugin)), - m_bypass (false) - { - /* Initialize midiInParams vector, where midiInParams.size == number of ---- giada.orig/src/core/plugin.h -+++ giada/src/core/plugin.h -@@ -45,7 +45,7 @@ - public: - - Plugin(ID id, const std::string& UID); -- Plugin(ID id, juce::AudioPluginInstance* p, double samplerate, int buffersize); -+ Plugin(ID id, std::unique_ptr p, double samplerate, int buffersize); - Plugin(const Plugin& o); - ~Plugin(); - -@@ -117,7 +117,7 @@ - - int countMainOutChannels() const; - -- juce::AudioPluginInstance* m_plugin; -+ std::unique_ptr m_plugin; - juce::AudioBuffer m_buffer; - - std::atomic m_bypass; ---- giada.orig/src/core/pluginManager.cpp -+++ giada/src/core/pluginManager.cpp -@@ -105,14 +105,14 @@ - - The following function simply drops the first hash code during comparison. */ - --const juce::PluginDescription* findPluginDescription_(const std::string& id) -+std::unique_ptr findPluginDescription_(const std::string& id) - { - std::vector idParts = splitPluginDescription_(id); - -- for (const juce::PluginDescription* pd : knownPluginList_) { -+ for (auto pd : knownPluginList_) { - std::vector tmpIdParts = splitPluginDescription_(pd->createIdentifierString().toStdString()); - if (idParts[0] == tmpIdParts[0] && idParts[2] == tmpIdParts[2]) -- return pd; -+ return std::unique_ptr (pd); - } - return nullptr; - } -@@ -184,7 +184,7 @@ - - int loadList(const std::string& filepath) - { -- std::unique_ptr elem(juce::XmlDocument::parse(juce::File(filepath))); -+ auto elem(juce::XmlDocument::parse(juce::File(filepath))); - if (elem == nullptr) - return 0; - knownPluginList_.recreateFromXml(*elem); -@@ -202,7 +202,7 @@ - - pluginId_.set(id); - -- const juce::PluginDescription* pd = findPluginDescription_(fid); -+ auto pd = findPluginDescription_(fid); - if (pd == nullptr) { - u::log::print("[pluginManager::makePlugin] no plugin found with fid=%s!\n", fid.c_str()); - missingPlugins_ = true; -@@ -210,7 +210,7 @@ - return std::make_unique(pluginId_.get(id), fid); // Invalid plug-in - } - -- juce::AudioPluginInstance* pi = pluginFormat_.createInstanceFromDescription(*pd, samplerate_, buffersize_); -+ auto pi = pluginFormat_.createInstanceFromDescription(*pd, samplerate_, buffersize_); - if (pi == nullptr) { - u::log::print("[pluginManager::makePlugin] unable to create instance with fid=%s!\n", fid.c_str()); - missingPlugins_ = true; diff --git a/debian/patches/03-JUCE544-compat.patch b/debian/patches/03-JUCE544-compat.patch new file mode 100644 index 0000000..38b86e7 --- /dev/null +++ b/debian/patches/03-JUCE544-compat.patch @@ -0,0 +1,93 @@ +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Tue, 20 Aug 2019 14:38:49 +0200 +Subject: JUCE544 compat + +--- + src/core/plugin.cpp | 6 +++--- + src/core/plugin.h | 4 ++-- + src/core/pluginManager.cpp | 18 ++++++++---------- + 3 files changed, 13 insertions(+), 15 deletions(-) + +--- giada.orig/src/core/plugin.cpp ++++ giada/src/core/plugin.cpp +@@ -54,11 +54,11 @@ + /* -------------------------------------------------------------------------- */ + + +-Plugin::Plugin(ID id, juce::AudioPluginInstance* plugin, double samplerate, ++Plugin::Plugin(ID id, std::unique_ptr plugin, double samplerate, + int buffersize) + : id (id), + valid (true), +- m_plugin (plugin), ++ m_plugin (std::move(plugin)), + m_bypass (false) + { + /* Initialize midiInParams vector, where midiInParams.size == number of +--- giada.orig/src/core/plugin.h ++++ giada/src/core/plugin.h +@@ -45,7 +45,7 @@ + public: + + Plugin(ID id, const std::string& UID); +- Plugin(ID id, juce::AudioPluginInstance* p, double samplerate, int buffersize); ++ Plugin(ID id, std::unique_ptr p, double samplerate, int buffersize); + Plugin(const Plugin& o); + ~Plugin(); + +@@ -117,7 +117,7 @@ + + int countMainOutChannels() const; + +- juce::AudioPluginInstance* m_plugin; ++ std::unique_ptr m_plugin; + juce::AudioBuffer m_buffer; + + std::atomic m_bypass; +--- giada.orig/src/core/pluginManager.cpp ++++ giada/src/core/pluginManager.cpp +@@ -105,14 +105,14 @@ + + The following function simply drops the first hash code during comparison. */ + +-const juce::PluginDescription* findPluginDescription_(const std::string& id) ++std::unique_ptr findPluginDescription_(const std::string& id) + { + std::vector idParts = splitPluginDescription_(id); + +- for (const juce::PluginDescription* pd : knownPluginList_) { ++ for (auto pd : knownPluginList_) { + std::vector tmpIdParts = splitPluginDescription_(pd->createIdentifierString().toStdString()); + if (idParts[0] == tmpIdParts[0] && idParts[2] == tmpIdParts[2]) +- return pd; ++ return std::unique_ptr (pd); + } + return nullptr; + } +@@ -184,7 +184,7 @@ + + int loadList(const std::string& filepath) + { +- std::unique_ptr elem(juce::XmlDocument::parse(juce::File(filepath))); ++ auto elem(juce::XmlDocument::parse(juce::File(filepath))); + if (elem == nullptr) + return 0; + knownPluginList_.recreateFromXml(*elem); +@@ -202,7 +202,7 @@ + + pluginId_.set(id); + +- const juce::PluginDescription* pd = findPluginDescription_(fid); ++ auto pd = findPluginDescription_(fid); + if (pd == nullptr) { + u::log::print("[pluginManager::makePlugin] no plugin found with fid=%s!\n", fid.c_str()); + missingPlugins_ = true; +@@ -210,7 +210,7 @@ + return std::make_unique(pluginId_.get(id), fid); // Invalid plug-in + } + +- juce::AudioPluginInstance* pi = pluginFormat_.createInstanceFromDescription(*pd, samplerate_, buffersize_); ++ auto pi = pluginFormat_.createInstanceFromDescription(*pd, samplerate_, buffersize_); + if (pi == nullptr) { + u::log::print("[pluginManager::makePlugin] unable to create instance with fid=%s!\n", fid.c_str()); + missingPlugins_ = true; diff --git a/debian/patches/series b/debian/patches/series index 896c531..ac3a338 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 02-rtmidi-pkgconfig.patch -0003-JUCE544-compat.patch +03-JUCE544-compat.patch