From 9d4bdb93a953b7638be4c5afaf7a6ab82ce82c05 Mon Sep 17 00:00:00 2001
From: Paul <nop@nop-desktop.(none)>
Date: Wed, 23 Sep 2009 20:58:46 +0300
Subject: [PATCH] Made unison frequency spread to depend on Bandwidth
 controllers and parameters (cherry picked from commit
 c2d08b3b5784059501bc074c6574e28b1c96c63f)

---
 plugins/zynaddsubfx/ChangeLog            | 2 +-
 plugins/zynaddsubfx/src/Synth/ADnote.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/zynaddsubfx/ChangeLog b/plugins/zynaddsubfx/ChangeLog
index 161dce552..88562858a 100644
--- a/plugins/zynaddsubfx/ChangeLog
+++ b/plugins/zynaddsubfx/ChangeLog
@@ -901,4 +901,4 @@
 
 23 Sep 2009 (Paul Nasca)
 	    - Added unison invert phase
-	    
\ No newline at end of file
+	    - Made unison frequency spread to depend on Bandwidth controllers and parameters
\ No newline at end of file
diff --git a/plugins/zynaddsubfx/src/Synth/ADnote.cpp b/plugins/zynaddsubfx/src/Synth/ADnote.cpp
index b3fdbfe11..8f7e70e43 100644
--- a/plugins/zynaddsubfx/src/Synth/ADnote.cpp
+++ b/plugins/zynaddsubfx/src/Synth/ADnote.cpp
@@ -776,6 +776,7 @@ void ADnote::compute_unison_freq_rap(int nvoice){
 		unison_freq_rap[nvoice][0]=1.0;
 		return;
 	};
+	REALTYPE relbw=ctl->bandwidth.relbw*bandwidthDetuneMultiplier;
 	for (int k=0;k<unison_size[nvoice];k++){
 		REALTYPE pos=unison_vibratto[nvoice].position[k];
 		REALTYPE step=unison_vibratto[nvoice].step[k];
@@ -788,7 +789,7 @@ void ADnote::compute_unison_freq_rap(int nvoice){
 			pos=1.0;
 			step=-step;
 		};
-		unison_freq_rap[nvoice][k]=unison_base_freq_rap[nvoice][k]+pos*unison_vibratto[nvoice].amplitude;
+		unison_freq_rap[nvoice][k]=1.0+((unison_base_freq_rap[nvoice][k]-1.0)+pos*unison_vibratto[nvoice].amplitude)*relbw;
 		
 		unison_vibratto[nvoice].position[k]=pos;
 		step=unison_vibratto[nvoice].step[k]=step;