Floating Point Dither For All

6 files changed, 125 insertions, 76 deletions

diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.cpp b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.cpp
index 48f223b..d0b8cf9 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.cpp
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.cpp
@@ -150,9 +150,7 @@ ComponentResult PurestConsoleBuss::Initialize()
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 void		PurestConsoleBuss::PurestConsoleBussKernel::Reset()
 {
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -168,10 +166,6 @@ void		PurestConsoleBuss::PurestConsoleBussKernel::Process(	const Float32 	*inSou
 	const Float32 *sourceP = inSourceP;
 	Float32 *destP = inDestP;
 
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
-
 	long double inputSample;
 	
 	while (nSampleFrames-- > 0) {
@@ -208,20 +202,12 @@ void		PurestConsoleBuss::PurestConsoleBussKernel::Process(	const Float32 	*inSou
 		inputSample = asin(inputSample);
 		//amplitude aspect
 		
-		//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;
 		
 		sourceP += inNumChannels; destP += inNumChannels;
diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.h b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.h
index a3df04f..590e797 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.h
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.h
@@ -118,9 +118,7 @@ public:
         virtual void		Reset();
 		
 		private: 
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;
+		long double fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.mode1v3 b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.mode1v3
index f301be9..f301be9 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.mode1v3
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.mode1v3
diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.pbxuser
index 3851c37..5e3513c 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.pbxuser
@@ -49,18 +49,21 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 538687633;
-			PBXWorkspaceStateSaveDate = 538687633;
+			PBXPerProjectTemplateStateSaveDate = 569585234;
+			PBXWorkspaceStateSaveDate = 569585234;
 		};
 		perUserProjectItems = {
-			8B4E550F201BB8BF00B5DC2A /* PlistBookmark */ = 8B4E550F201BB8BF00B5DC2A /* PlistBookmark */;
-			8BBE45541FE5F3CA0022E6F7 /* PlistBookmark */ = 8BBE45541FE5F3CA0022E6F7 /* PlistBookmark */;
+			8B34923F2054559600C0EF7D /* PlistBookmark */ = 8B34923F2054559600C0EF7D /* PlistBookmark */;
+			8B79265921F32EAB006E9731 /* PBXBookmark */ = 8B79265921F32EAB006E9731 /* PBXBookmark */;
+			8B79265F21F32F13006E9731 /* PBXTextBookmark */ = 8B79265F21F32F13006E9731 /* PBXTextBookmark */;
+			8B79266421F32F25006E9731 /* PBXTextBookmark */ = 8B79266421F32F25006E9731 /* PBXTextBookmark */;
+			8B79266721F32F25006E9731 /* PBXTextBookmark */ = 8B79266721F32F25006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B4E550F201BB8BF00B5DC2A /* PlistBookmark */ = {
+	8B34923F2054559600C0EF7D /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 8D01CCD10486CAD60068D4B7 /* Info.plist */;
 		fallbackIsa = PBXBookmark;
@@ -68,16 +71,50 @@
 		kPath = (
 			CFBundleName,
 		);
-		name = /Users/christopherjohnson/Desktop/github/plugins/MacAU/PurestConsoleBuss/Info.plist;
+		name = /Users/christopherjohnson/Desktop/MacAU/PurestConsoleBuss/Info.plist;
+		rLen = 0;
+		rLoc = 9223372036854775808;
+	};
+	8B79265921F32EAB006E9731 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 8BA05A660720730100365D66 /* PurestConsoleBuss.cpp */;
+	};
+	8B79265F21F32F13006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* PurestConsoleBuss.cpp */;
+		name = "PurestConsoleBuss.cpp: 210";
 		rLen = 0;
-		rLoc = 9223372036854775807;
+		rLoc = 9637;
+		rType = 0;
+		vrLen = 493;
+		vrLoc = 9142;
+	};
+	8B79266421F32F25006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* PurestConsoleBuss.cpp */;
+		name = "PurestConsoleBuss.cpp: 210";
+		rLen = 0;
+		rLoc = 9637;
+		rType = 0;
+		vrLen = 493;
+		vrLoc = 9142;
+	};
+	8B79266721F32F25006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* PurestConsoleBuss.cpp */;
+		name = "PurestConsoleBuss.cpp: 168";
+		rLen = 0;
+		rLoc = 7709;
+		rType = 0;
+		vrLen = 2197;
+		vrLoc = 7528;
 	};
 	8BA05A660720730100365D66 /* PurestConsoleBuss.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 3198}}";
-			sepNavSelRange = "{9296, 242}";
-			sepNavVisRange = "{7889, 2106}";
-			sepNavWindowFrame = "{{545, 39}, {895, 839}}";
+			sepNavIntBoundsRect = "{{0, 0}, {677, 2990}}";
+			sepNavSelRange = "{9637, 0}";
+			sepNavVisRange = "{9142, 493}";
+			sepNavWindowFrame = "{{301, 26}, {895, 839}}";
 		};
 	};
 	8BA05A690720730100365D66 /* PurestConsoleBussVersion.h */ = {
@@ -88,23 +125,11 @@
 			sepNavWindowFrame = "{{461, 39}, {895, 839}}";
 		};
 	};
-	8BBE45541FE5F3CA0022E6F7 /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D01CCD10486CAD60068D4B7 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-			CFBundleName,
-		);
-		name = /Users/christopherjohnson/Desktop/MacAU/PurestConsoleBuss/Info.plist;
-		rLen = 0;
-		rLoc = 9223372036854775808;
-	};
 	8BC6025B073B072D006C4272 /* PurestConsoleBuss.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {894, 1690}}";
-			sepNavSelRange = "{2904, 0}";
-			sepNavVisRange = "{2002, 1900}";
+			sepNavIntBoundsRect = "{{0, 0}, {894, 1664}}";
+			sepNavSelRange = "{4995, 0}";
+			sepNavVisRange = "{3220, 1877}";
 			sepNavWindowFrame = "{{539, 39}, {895, 839}}";
 		};
 	};
diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.perspectivev3
index f555b58..699b00b 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/christopherjohnson.perspectivev3
@@ -222,11 +222,52 @@
 		</dict>
 	</array>
 	<key>OpenEditors</key>
-	<array/>
+	<array>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>8B79266521F32F25006E9731</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>PurestConsoleBuss.cpp</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>8B79266621F32F25006E9731</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>PurestConsoleBuss.cpp</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>8B79266721F32F25006E9731</string>
+						<key>history</key>
+						<array>
+							<string>8B79265921F32EAB006E9731</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {895, 742}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>301 82 895 783 0 0 1440 878 </string>
+			</dict>
+		</dict>
+	</array>
 	<key>PerspectiveWidths</key>
 	<array>
-		<integer>810</integer>
-		<integer>810</integer>
+		<integer>841</integer>
+		<integer>841</integer>
 	</array>
 	<key>Perspectives</key>
 	<array>
@@ -256,8 +297,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -301,7 +340,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>4</integer>
+									<integer>3</integer>
 									<integer>2</integer>
 									<integer>1</integer>
 									<integer>0</integer>
@@ -325,7 +364,7 @@
 							<real>288</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>599 222 841 654 0 0 1440 878 </string>
+						<string>492 170 841 654 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -341,7 +380,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>8BD7274A1D46E5A5000176F0</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>Info.plist</string>
+								<string>PurestConsoleBuss.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -349,14 +388,15 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>8BD7274B1D46E5A5000176F0</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>Info.plist</string>
+										<string>PurestConsoleBuss.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B4E550F201BB8BF00B5DC2A</string>
+										<string>8B79266421F32F25006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8BBE45541FE5F3CA0022E6F7</string>
+											<string>8B34923F2054559600C0EF7D</string>
+											<string>8B79265F21F32F13006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -370,18 +410,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {531, 229}}</string>
+								<string>{{0, 0}, {531, 188}}</string>
 								<key>RubberWindowFrame</key>
-								<string>599 222 841 654 0 0 1440 878 </string>
+								<string>492 170 841 654 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>229pt</string>
+							<string>188pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>379pt</string>
+							<string>420pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -395,9 +435,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 352}}</string>
-										<key>RubberWindowFrame</key>
-										<string>599 222 841 654 0 0 1440 878 </string>
+										<string>{{10, 27}, {531, 393}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -451,7 +489,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 31}, {603, 297}}</string>
+										<string>{{10, 27}, {531, 393}}</string>
+										<key>RubberWindowFrame</key>
+										<string>492 170 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -479,11 +519,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B4E5510201BB8BF00B5DC2A</string>
+				<string>8B79265421F32E69006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B4E5511201BB8BF00B5DC2A</string>
+				<string>8B79265521F32E69006E9731</string>
 				<string>8BD7274A1D46E5A5000176F0</string>
-				<string>8B4E5512201BB8BF00B5DC2A</string>
+				<string>8B79265621F32E69006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -656,7 +696,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>538687679.06755602</real>
+	<real>569585445.78409505</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -673,11 +713,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B4E5513201BB8BF00B5DC2A</string>
-		<string>/Users/christopherjohnson/Desktop/github/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj</string>
+		<string>8B79266521F32F25006E9731</string>
+		<string>/Users/christopherjohnson/Desktop/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>599 222 841 654 0 0 1440 878 </string>
+	<string>492 170 841 654 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/project.pbxproj b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/project.pbxproj
index c25ead8..c25ead8 100644..100755
--- a/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/project.pbxproj
+++ b/plugins/MacAU/PurestConsoleBuss/PurestConsoleBuss.xcodeproj/project.pbxproj