From: IOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Date: Thu, 2 Apr 2020 11:35:34 +0000 (+0200)
Subject: Refresh JUCE-patch
X-Git-Tag: archive/raspbian/0.16.2.2+ds1-1+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b073c666dff3eccccc75f47fce30cddd5b99fbd;p=giada.git

Refresh JUCE-patch
---

diff --git a/debian/patches/03-JUCE544-compat.patch b/debian/patches/03-JUCE544-compat.patch
index 38b86e7..72bb99d 100644
--- a/debian/patches/03-JUCE544-compat.patch
+++ b/debian/patches/03-JUCE544-compat.patch
@@ -24,17 +24,36 @@ Subject: JUCE544 compat
    m_bypass    (false)
  {
  	/* Initialize midiInParams vector, where midiInParams.size == number of 
+@@ -87,12 +87,12 @@
+ /* -------------------------------------------------------------------------- */
+ 
+ 
+-Plugin::Plugin(const Plugin& o)
++Plugin::Plugin(Plugin& o)
+ : id          (o.id),
++  midiInParams(o.midiInParams),
+   valid       (o.valid),
+-  m_plugin    (o.m_plugin),
+-  m_bypass    (o.m_bypass.load()),
+-  midiInParams(o.midiInParams)
++  m_plugin    (std::move(o.m_plugin)),
++  m_bypass    (o.m_bypass.load())
+ {
+ }
+ 
 --- giada.orig/src/core/plugin.h
 +++ giada/src/core/plugin.h
-@@ -45,7 +45,7 @@
+@@ -45,8 +45,8 @@
  public:
  
  	Plugin(ID id, const std::string& UID);
 -	Plugin(ID id, juce::AudioPluginInstance* p, double samplerate, int buffersize);
+-	Plugin(const Plugin& o);
 +	Plugin(ID id, std::unique_ptr<juce::AudioPluginInstance> p, double samplerate, int buffersize);
- 	Plugin(const Plugin& o);
++	Plugin(Plugin& o);
  	~Plugin();
  
+ 	/* getUniqueId
 @@ -117,7 +117,7 @@
  
  	int countMainOutChannels() const;
@@ -91,3 +110,12 @@ Subject: JUCE544 compat
  	if (pi == nullptr) {
  		u::log::print("[pluginManager::makePlugin] unable to create instance with fid=%s!\n", fid.c_str());
  		missingPlugins_ = true;
+@@ -219,7 +219,7 @@
+ 	}
+ 	u::log::print("[pluginManager::makePlugin] plugin instance with fid=%s created\n", fid.c_str());
+ 
+-	return std::make_unique<Plugin>(pluginId_.get(id), pi, samplerate_, buffersize_);
++	return std::make_unique<Plugin>(pluginId_.get(id), std::move(pi), samplerate_, buffersize_);
+ }
+ 
+