Floating Point Dither For All

3 files changed, 50 insertions, 56 deletions

diff --git a/plugins/MacAU/ButterComp/ButterComp.cpp b/plugins/MacAU/ButterComp/ButterComp.cpp
index 612eb3c..5280a58 100755
--- a/plugins/MacAU/ButterComp/ButterComp.cpp
+++ b/plugins/MacAU/ButterComp/ButterComp.cpp
@@ -188,9 +188,6 @@ void		ButterComp::ButterCompKernel::Process(	const Float32 	*inSourceP,
 	Float64 overallscale = 2.0;
 	overallscale /= 44100.0;
 	overallscale *= GetSampleRate();
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	Float64 inputpos;
 	Float64 inputneg;
 	Float64 calcpos;
@@ -286,11 +283,11 @@ void		ButterComp::ButterCompKernel::Process(	const Float32 	*inSourceP,
 		inputSample /= outputgain;
 		if (wet < 1.0) inputSample = (drySample * dry)+(inputSample*wet);
 
-		//noise shaping to 32-bit floating point
-		fpTemp = inputSample;
-		fpNShape = (fpNShape*fpOld)+((inputSample-fpTemp)*fpNew);
-		inputSample += fpNShape;
-		//end noise shaping on 32 bit output		
+		//32 bit dither, made small and tidy.
+		int expon; frexpf((Float32)inputSample, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSample += (dither-fpNShape); fpNShape = dither;
+		//end 32 bit dither
 		
 		*destP = inputSample;
 		
diff --git a/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.pbxuser
index 0757b10..21b9158 100755
--- a/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.pbxuser
@@ -51,24 +51,44 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 559509267;
-			PBXWorkspaceStateSaveDate = 559509267;
+			PBXPerProjectTemplateStateSaveDate = 569590364;
+			PBXWorkspaceStateSaveDate = 569590364;
 		};
 		perUserProjectItems = {
+			8B79288121F342AF006E9731 /* PBXTextBookmark */ = 8B79288121F342AF006E9731 /* PBXTextBookmark */;
+			8B79288621F342C1006E9731 /* PBXTextBookmark */ = 8B79288621F342C1006E9731 /* PBXTextBookmark */;
 			8BE626A621596E0600E4E476 /* PBXTextBookmark */ = 8BE626A621596E0600E4E476 /* PBXTextBookmark */;
-			8BE626D221596F6E00E4E476 /* PBXTextBookmark */ = 8BE626D221596F6E00E4E476 /* PBXTextBookmark */;
-			8BE626D321596F6E00E4E476 /* PBXTextBookmark */ = 8BE626D321596F6E00E4E476 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
+	8B79288121F342AF006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ButterComp.cpp */;
+		name = "ButterComp.cpp: 266";
+		rLen = 0;
+		rLoc = 11774;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
+	};
+	8B79288621F342C1006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ButterComp.cpp */;
+		name = "ButterComp.cpp: 266";
+		rLen = 0;
+		rLoc = 11774;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
+	};
 	8BA05A660720730100365D66 /* ButterComp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {579, 4004}}";
-			sepNavSelRange = "{11891, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {554, 3965}}";
+			sepNavSelRange = "{11774, 0}";
 			sepNavVisRange = "{0, 0}";
-			sepNavWindowFrame = "{{618, 69}, {834, 801}}";
+			sepNavWindowFrame = "{{405, 77}, {834, 801}}";
 		};
 	};
 	8BA05A670720730100365D66 /* ButterComp.exp */ = {
@@ -89,9 +109,9 @@
 	};
 	8BC6025B073B072D006C4272 /* ButterComp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {698, 1885}}";
+			sepNavIntBoundsRect = "{{0, 0}, {824, 1846}}";
 			sepNavSelRange = "{5162, 0}";
-			sepNavVisRange = "{3553, 95}";
+			sepNavVisRange = "{3901, 1436}";
 			sepNavWindowFrame = "{{606, 77}, {834, 801}}";
 		};
 	};
@@ -119,26 +139,6 @@
 		vrLen = 95;
 		vrLoc = 3553;
 	};
-	8BE626D221596F6E00E4E476 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ButterComp.cpp */;
-		name = "ButterComp.cpp: 269";
-		rLen = 0;
-		rLoc = 11891;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
-	8BE626D321596F6E00E4E476 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ButterComp.cpp */;
-		name = "ButterComp.cpp: 269";
-		rLen = 0;
-		rLoc = 11891;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
 	8D01CCC60486CAD60068D4B7 /* ButterComp */ = {
 		activeExec = 0;
 	};
diff --git a/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.perspectivev3
index 412b584..f0011a1 100755
--- a/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/ButterComp/ButterComp.xcodeproj/christopherjohnson.perspectivev3
@@ -256,8 +256,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -324,7 +322,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>628 380 810 487 0 0 1440 878 </string>
+						<string>447 360 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -352,11 +350,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8BE626D321596F6E00E4E476</string>
+										<string>8B79288621F342C1006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8BE626A621596E0600E4E476</string>
-											<string>8BE626D221596F6E00E4E476</string>
+											<string>8B79288121F342AF006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -370,18 +368,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 32}}</string>
+								<string>{{0, 0}, {603, 13}}</string>
 								<key>RubberWindowFrame</key>
-								<string>628 380 810 487 0 0 1440 878 </string>
+								<string>447 360 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>32pt</string>
+							<string>13pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>409pt</string>
+							<string>428pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -395,9 +393,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 382}}</string>
-										<key>RubberWindowFrame</key>
-										<string>628 380 810 487 0 0 1440 878 </string>
+										<string>{{10, 27}, {603, 401}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -451,7 +447,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 414}}</string>
+										<string>{{10, 27}, {603, 401}}</string>
+										<key>RubberWindowFrame</key>
+										<string>447 360 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -479,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BE626D421596F6E00E4E476</string>
+				<string>8B79288721F342C1006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BE626D521596F6E00E4E476</string>
+				<string>8B79288821F342C1006E9731</string>
 				<string>8B7FDBEA1F85C96D00A80060</string>
-				<string>8BE626D621596F6E00E4E476</string>
+				<string>8B79288921F342C1006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -656,7 +654,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>559509358.82003796</real>
+	<real>569590465.72403705</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -673,11 +671,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8BE626D721596F6E00E4E476</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/ButterComp/ButterComp.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>628 380 810 487 0 0 1440 878 </string>
+	<string>447 360 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>