From 06808ba5ab05eea3e2559e648903ddf5bf4d5137 Mon Sep 17 00:00:00 2001
From: "Raine M. Ekman" <raine@iki.fi>
Date: Sun, 22 Nov 2015 22:49:48 +0200
Subject: [PATCH] Organic: first stab at fixing #1499 through moving oscillator
 phase offsets into each note, in _n->m_pluginData.

---
 plugins/organic/organic.cpp | 23 +++++++++++++----------
 plugins/organic/organic.h   |  2 ++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
index 95e229613..d8bd87536 100644
--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -234,16 +234,14 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 	{
 		Oscillator * oscs_l[m_numOscillators];
 		Oscillator * oscs_r[m_numOscillators];
+		float * phaseOffsetLeft = new float[m_numOscillators];
+		float * phaseOffsetRight = new float[m_numOscillators];
 
 		for( int i = m_numOscillators - 1; i >= 0; --i )
 		{
 			
-			m_osc[i]->m_phaseOffsetLeft = rand()
-							/ ( RAND_MAX + 1.0f );
-			m_osc[i]->m_phaseOffsetRight = rand()
-							/ ( RAND_MAX + 1.0f );
-			
-
+			phaseOffsetLeft[i] = rand() / ( RAND_MAX + 1.0f );
+			phaseOffsetRight[i] = rand() / ( RAND_MAX + 1.0f );
 			
 			// initialise ocillators
 			
@@ -255,7 +253,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningLeft,
-						m_osc[i]->m_phaseOffsetLeft,
+						phaseOffsetLeft[i],
 						m_osc[i]->m_volumeLeft );
 				// create right oscillator
 				oscs_r[i] = new Oscillator(
@@ -263,7 +261,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningRight,
-						m_osc[i]->m_phaseOffsetRight,
+						phaseOffsetRight[i],
 						m_osc[i]->m_volumeRight );
 			}
 			else
@@ -274,7 +272,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningLeft,
-						m_osc[i]->m_phaseOffsetLeft,
+						phaseOffsetLeft[i],
 						m_osc[i]->m_volumeLeft,
 						oscs_l[i + 1] );
 				// create right oscillator
@@ -283,7 +281,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningRight,
-						m_osc[i]->m_phaseOffsetRight,
+						phaseOffsetRight[i],
 						m_osc[i]->m_volumeRight,
 						oscs_r[i + 1] );
 			}
@@ -294,6 +292,8 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 		_n->m_pluginData = new oscPtr;
 		static_cast<oscPtr *>( _n->m_pluginData )->oscLeft = oscs_l[0];
 		static_cast<oscPtr *>( _n->m_pluginData )->oscRight = oscs_r[0];
+		static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft = phaseOffsetLeft;
+		static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight = phaseOffsetRight;
 	}
 
 	Oscillator * osc_l = static_cast<oscPtr *>( _n->m_pluginData )->oscLeft;
@@ -330,6 +330,9 @@ void organicInstrument::deleteNotePluginData( NotePlayHandle * _n )
 						_n->m_pluginData )->oscLeft );
 	delete static_cast<Oscillator *>( static_cast<oscPtr *>(
 						_n->m_pluginData )->oscRight );
+	delete[] static_cast<oscPtr *>(	_n->m_pluginData )->phaseOffsetLeft;
+	delete[] static_cast<oscPtr *>(	_n->m_pluginData )->phaseOffsetRight;
+
 	delete static_cast<oscPtr *>( _n->m_pluginData );
 }
 
diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h
index a5ef5451e..7aea5b061 100644
--- a/plugins/organic/organic.h
+++ b/plugins/organic/organic.h
@@ -153,6 +153,8 @@ private:
 		MM_OPERATORS
 		Oscillator * oscLeft;
 		Oscillator * oscRight;
+		float * phaseOffsetLeft;
+		float * phaseOffsetRight;		
 	} ;
 
 	const IntModel m_modulationAlgo;