Floating Point Dither For All

6 files changed, 43 insertions, 77 deletions

diff --git a/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.pbxuser
index ed57dee..80718cb 100755
--- a/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.pbxuser
@@ -2,7 +2,7 @@
 {
 	089C1669FE841209C02AAC07 /* Project object */ = {
 		activeBuildConfigurationName = Release;
-		activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */;
+		activeTarget = 8D01CCC60486CAD60068D4B7 /* Surge */;
 		codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528463544;
-			PBXWorkspaceStateSaveDate = 528463544;
+			PBXPerProjectTemplateStateSaveDate = 569772809;
+			PBXWorkspaceStateSaveDate = 569772809;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -58,17 +58,17 @@
 	};
 	2407DEB6089929BA00EB68BF /* Surge.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 1690}}";
-			sepNavSelRange = "{609, 0}";
-			sepNavVisRange = "{0, 1883}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 1807}}";
+			sepNavSelRange = "{459, 0}";
+			sepNavVisRange = "{0, 1913}";
 			sepNavWindowFrame = "{{12, 47}, {895, 831}}";
 		};
 	};
 	245463B80991757100464AD3 /* Surge.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {866, 936}}";
-			sepNavSelRange = "{2622, 0}";
-			sepNavVisRange = "{354, 2279}";
+			sepNavIntBoundsRect = "{{0, 0}, {866, 910}}";
+			sepNavSelRange = "{2423, 0}";
+			sepNavVisRange = "{335, 2246}";
 			sepNavWindowFrame = "{{20, 47}, {895, 831}}";
 		};
 	};
@@ -102,7 +102,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
+	8D01CCC60486CAD60068D4B7 /* Surge */ = {
 		activeExec = 0;
 	};
 }
diff --git a/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.perspectivev3
index 2e5daef..149ac16 100755
--- a/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Surge/Surge.xcodeproj/christopherjohnson.perspectivev3
@@ -300,7 +300,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>6</integer>
+									<integer>5</integer>
 									<integer>4</integer>
 									<integer>0</integer>
 								</array>
@@ -386,8 +386,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {603, 414}}</string>
-										<key>RubberWindowFrame</key>
-										<string>456 253 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -441,7 +439,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 282}}</string>
+										<string>{{10, 27}, {603, 414}}</string>
+										<key>RubberWindowFrame</key>
+										<string>456 253 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -469,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D7E841F7FB6D2007AB60F</string>
+				<string>8B7940CE21F60B33006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D7E851F7FB6D2007AB60F</string>
+				<string>8B7940CF21F60B33006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D7E861F7FB6D2007AB60F</string>
+				<string>8B7940D021F60B33006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -626,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528463570.73526001</real>
+	<real>569772851.163517</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -643,7 +643,7 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D7E871F7FB6D2007AB60F</string>
+		<string>8B7940D121F60B33006E9731</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/Surge/Surge.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/Surge/Surge.xcodeproj/project.pbxproj b/plugins/MacVST/Surge/Surge.xcodeproj/project.pbxproj
index 20bb253..f42ed0d 100755
--- a/plugins/MacVST/Surge/Surge.xcodeproj/project.pbxproj
+++ b/plugins/MacVST/Surge/Surge.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
+		8D01CCC60486CAD60068D4B7 /* Surge */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "Surge" */;
 			buildPhases = (
@@ -1947,7 +1947,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				8D01CCC60486CAD60068D4B7 /* AudioUnit */,
+				8D01CCC60486CAD60068D4B7 /* Surge */,
 			);
 		};
 /* End PBXProject section */
diff --git a/plugins/MacVST/Surge/source/Surge.cpp b/plugins/MacVST/Surge/source/Surge.cpp
index 711c0df..222fbcf 100755
--- a/plugins/MacVST/Surge/source/Surge.cpp
+++ b/plugins/MacVST/Surge/source/Surge.cpp
@@ -12,10 +12,8 @@ AudioEffect* createEffectInstance(audioMasterCallback audioMaster) {return new S
 Surge::Surge(audioMasterCallback audioMaster) :
     AudioEffectX(audioMaster, kNumPrograms, kNumParameters)
 {
-	fpNShapeAL = 0.0;
-	fpNShapeBL = 0.0;
-	fpNShapeAR = 0.0;
-	fpNShapeBR = 0.0;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 	flip = true;
 	chaseA = 0.0;
 	chaseB = 0.0;
diff --git a/plugins/MacVST/Surge/source/Surge.h b/plugins/MacVST/Surge/source/Surge.h
index 0e485c3..7f42c9f 100755
--- a/plugins/MacVST/Surge/source/Surge.h
+++ b/plugins/MacVST/Surge/source/Surge.h
@@ -53,10 +53,8 @@ private:
     char _programName[kVstMaxProgNameLen + 1];
     std::set< std::string > _canDo;
     
-	long double fpNShapeAL;
-	long double fpNShapeBL;
-	long double fpNShapeAR;
-	long double fpNShapeBR;
+	long double fpNShapeL;
+	long double fpNShapeR;
 	bool flip;
 	long double chaseA;
 	long double chaseB;
diff --git a/plugins/MacVST/Surge/source/SurgeProc.cpp b/plugins/MacVST/Surge/source/SurgeProc.cpp
index 7a72b2f..cd82bad 100755
--- a/plugins/MacVST/Surge/source/SurgeProc.cpp
+++ b/plugins/MacVST/Surge/source/SurgeProc.cpp
@@ -17,9 +17,6 @@ void Surge::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -120,27 +117,14 @@ void Surge::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra
 		inputSampleR = drySampleR - (inputSampleR * intensity);
 		inputSampleR = (drySampleR * dry) + (inputSampleR * wet);
 		
-		//noise shaping to 32-bit floating point
-		if (flip) {
-			fpTemp = inputSampleL;
-			fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeAL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeAR;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeBL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeBR;
-		}
-		flip = !flip;
-		//end noise shaping on 32 bit output
+		//stereo 32 bit dither, made small and tidy.
+		int expon; frexpf((float)inputSampleL, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+		frexpf((float)inputSampleR, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 32 bit dither
 		
 		*out1 = inputSampleL;
 		*out2 = inputSampleR;
@@ -162,9 +146,6 @@ void Surge::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	double fpTemp; //this is different from singlereplacing
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -264,27 +245,16 @@ void Surge::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s
 		inputSampleR = drySampleR - (inputSampleR * intensity);
 		inputSampleR = (drySampleR * dry) + (inputSampleR * wet);
 		
-		//noise shaping to 64-bit floating point
-		if (flip) {
-			fpTemp = inputSampleL;
-			fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeAL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeAR;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeBL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeBR;
-		}
-		flip = !flip;
-		//end noise shaping on 64 bit output
+		//stereo 64 bit dither, made small and tidy.
+		int expon; frexp((double)inputSampleL, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		dither /= 536870912.0; //needs this to scale to 64 bit zone
+		inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+		frexp((double)inputSampleR, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		dither /= 536870912.0; //needs this to scale to 64 bit zone
+		inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 64 bit dither
 		
 		*out1 = inputSampleL;
 		*out2 = inputSampleR;