Floating Point Dither For All

6 files changed, 62 insertions, 67 deletions

diff --git a/plugins/MacAU/GrooveWear/GrooveWear.cpp b/plugins/MacAU/GrooveWear/GrooveWear.cpp
index baf7ac4..62c9634 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.cpp
+++ b/plugins/MacAU/GrooveWear/GrooveWear.cpp
@@ -177,9 +177,7 @@ void		GrooveWear::GrooveWearKernel::Reset()
 	bMidPrev = 0.0;
 	cMidPrev = 0.0;
 	dMidPrev = 0.0;
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -194,9 +192,6 @@ void		GrooveWear::GrooveWearKernel::Process(	const Float32 	*inSourceP,
 	UInt32 nSampleFrames = inFramesToProcess;
 	const Float32 *sourceP = inSourceP;
 	Float32 *destP = inDestP;
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	Float64 overallscale = (pow(GetParameter( kParam_One ),2)*19.0)+1.0;
 	Float64 gain = overallscale;
@@ -449,19 +444,11 @@ void		GrooveWear::GrooveWearKernel::Process(	const Float32 	*inSourceP,
 			inputSample = (inputSample * dWet) + (drySample * dDry);
 		}
 		
-		//noise shaping to 32-bit floating point
-		if (fpFlip) {
-			fpTemp = inputSample;
-			fpNShapeA = (fpNShapeA*fpOld)+((inputSample-fpTemp)*fpNew);
-			inputSample += fpNShapeA;
-		}
-		else {
-			fpTemp = inputSample;
-			fpNShapeB = (fpNShapeB*fpOld)+((inputSample-fpTemp)*fpNew);
-			inputSample += fpNShapeB;
-		}
-		fpFlip = !fpFlip;
-		//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/GrooveWear/GrooveWear.h b/plugins/MacAU/GrooveWear/GrooveWear.h
index b9e7722..5f86da8 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.h
+++ b/plugins/MacAU/GrooveWear/GrooveWear.h
@@ -138,9 +138,7 @@ public:
 		Float64 cMidPrev;
 		Float64 dMidPrev;
 		
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;
+		long double fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.mode1v3 b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.mode1v3
index f301be9..f301be9 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.mode1v3
+++ b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.mode1v3
diff --git a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
index bdb3283..1980dfa 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
@@ -49,14 +49,15 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 538681963;
-			PBXWorkspaceStateSaveDate = 538681963;
+			PBXPerProjectTemplateStateSaveDate = 569647523;
+			PBXWorkspaceStateSaveDate = 569647523;
 		};
 		perUserProjectItems = {
 			8B0E2BD7201B927800943268 /* PlistBookmark */ = 8B0E2BD7201B927800943268 /* PlistBookmark */;
 			8B0E2BD8201B927800943268 /* PBXTextBookmark */ = 8B0E2BD8201B927800943268 /* PBXTextBookmark */;
-			8B4E5400201BA1BA00B5DC2A /* PBXTextBookmark */ = 8B4E5400201BA1BA00B5DC2A /* PBXTextBookmark */;
-			8B4E5435201BA7FC00B5DC2A /* PBXTextBookmark */ = 8B4E5435201BA7FC00B5DC2A /* PBXTextBookmark */;
+			8B181B43204CA16500516BEE /* PBXTextBookmark */ = 8B181B43204CA16500516BEE /* PBXTextBookmark */;
+			8B792CBD21F42257006E9731 /* PBXTextBookmark */ = 8B792CBD21F42257006E9731 /* PBXTextBookmark */;
+			8B792CC221F422B5006E9731 /* PBXTextBookmark */ = 8B792CC221F422B5006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
@@ -84,47 +85,57 @@
 		vrLen = 297;
 		vrLoc = 2667;
 	};
-	8B4E5400201BA1BA00B5DC2A /* PBXTextBookmark */ = {
+	8B181B43204CA16500516BEE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BC6025B073B072D006C4272 /* GrooveWear.h */;
 		name = "GrooveWear.h: 135";
 		rLen = 0;
 		rLoc = 5282;
 		rType = 0;
-		vrLen = 272;
-		vrLoc = 2923;
+		vrLen = 217;
+		vrLoc = 2978;
 	};
-	8B4E5435201BA7FC00B5DC2A /* PBXTextBookmark */ = {
+	8B792CBD21F42257006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* GrooveWear.h */;
-		name = "GrooveWear.h: 135";
-		rLen = 0;
-		rLoc = 5282;
+		fRef = 8BA05A660720730100365D66 /* GrooveWear.cpp */;
+		name = "GrooveWear.cpp: 336";
+		rLen = 90;
+		rLoc = 15454;
+		rType = 0;
+		vrLen = 324;
+		vrLoc = 15544;
+	};
+	8B792CC221F422B5006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* GrooveWear.cpp */;
+		name = "GrooveWear.cpp: 336";
+		rLen = 90;
+		rLoc = 15454;
 		rType = 0;
-		vrLen = 271;
-		vrLoc = 2924;
+		vrLen = 324;
+		vrLoc = 15544;
 	};
 	8BA05A660720730100365D66 /* GrooveWear.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 6123}}";
-			sepNavSelRange = "{15606, 90}";
-			sepNavVisRange = "{13375, 2804}";
-			sepNavWindowFrame = "{{532, 39}, {895, 839}}";
+			sepNavIntBoundsRect = "{{0, 0}, {677, 6058}}";
+			sepNavSelRange = "{15454, 90}";
+			sepNavVisRange = "{15544, 324}";
+			sepNavWindowFrame = "{{413, 39}, {895, 839}}";
 		};
 	};
 	8BA05A690720730100365D66 /* GrooveWearVersion.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {824, 767}}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 767}}";
 			sepNavSelRange = "{2897, 0}";
-			sepNavVisRange = "{2667, 297}";
-			sepNavWindowFrame = "{{15, 39}, {895, 839}}";
+			sepNavVisRange = "{50, 2915}";
+			sepNavWindowFrame = "{{593, 37}, {895, 839}}";
 		};
 	};
 	8BC6025B073B072D006C4272 /* GrooveWear.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {761, 2275}}";
-			sepNavSelRange = "{5282, 0}";
-			sepNavVisRange = "{2924, 271}";
+			sepNavIntBoundsRect = "{{0, 0}, {894, 1898}}";
+			sepNavSelRange = "{5410, 0}";
+			sepNavVisRange = "{4014, 1506}";
 			sepNavWindowFrame = "{{542, 39}, {895, 839}}";
 		};
 	};
diff --git a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
index a0182a0..3db790a 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
@@ -256,8 +256,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -302,7 +300,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>4</integer>
+									<integer>3</integer>
 									<integer>2</integer>
 									<integer>1</integer>
 									<integer>0</integer>
@@ -326,7 +324,7 @@
 							<real>288</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>603 113 841 654 0 0 1440 878 </string>
+						<string>442 219 841 654 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -342,7 +340,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>8BD7274A1D46E5A5000176F0</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>GrooveWear.h</string>
+								<string>GrooveWear.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -350,16 +348,17 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>8BD7274B1D46E5A5000176F0</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>GrooveWear.h</string>
+										<string>GrooveWear.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B4E5435201BA7FC00B5DC2A</string>
+										<string>8B792CC221F422B5006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B0E2BD7201B927800943268</string>
 											<string>8B0E2BD8201B927800943268</string>
-											<string>8B4E5400201BA1BA00B5DC2A</string>
+											<string>8B181B43204CA16500516BEE</string>
+											<string>8B792CBD21F42257006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -373,18 +372,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {531, 142}}</string>
+								<string>{{0, 0}, {531, 109}}</string>
 								<key>RubberWindowFrame</key>
-								<string>603 113 841 654 0 0 1440 878 </string>
+								<string>442 219 841 654 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>142pt</string>
+							<string>109pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>466pt</string>
+							<string>499pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -398,9 +397,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 439}}</string>
-										<key>RubberWindowFrame</key>
-										<string>603 113 841 654 0 0 1440 878 </string>
+										<string>{{10, 27}, {531, 472}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -454,7 +451,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 365}}</string>
+										<string>{{10, 27}, {531, 472}}</string>
+										<key>RubberWindowFrame</key>
+										<string>442 219 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -482,11 +481,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B4E540C201BA27000B5DC2A</string>
+				<string>8B792CC321F422B5006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B4E540D201BA27000B5DC2A</string>
+				<string>8B792CC421F422B5006E9731</string>
 				<string>8BD7274A1D46E5A5000176F0</string>
-				<string>8B4E540E201BA27000B5DC2A</string>
+				<string>8B792CC521F422B5006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -659,7 +658,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>538683388.29162097</real>
+	<real>569647797.66937697</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -679,7 +678,7 @@
 		<string>/Users/christopherjohnson/Desktop/MacAU/GrooveWear/GrooveWear.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>603 113 841 654 0 0 1440 878 </string>
+	<string>442 219 841 654 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/project.pbxproj b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/project.pbxproj
index 06d3db0..06d3db0 100644..100755
--- a/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/project.pbxproj
+++ b/plugins/MacAU/GrooveWear/GrooveWear.xcodeproj/project.pbxproj