Floating Point Dither For All

4 files changed, 37 insertions, 65 deletions

diff --git a/plugins/MacAU/FromTape/FromTape.cpp b/plugins/MacAU/FromTape/FromTape.cpp
index 4a305e9..30fe41a 100755
--- a/plugins/MacAU/FromTape/FromTape.cpp
+++ b/plugins/MacAU/FromTape/FromTape.cpp
@@ -221,9 +221,7 @@ void		FromTape::FromTapeKernel::Reset()
 	iirSampleZ = 0.0;
 	flip = 0;
 	//noisesource = 0;
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -259,9 +257,6 @@ void		FromTape::FromTapeKernel::Process(	const Float32 	*inSourceP,
 	
 	
 	long double inputSample;
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	while (nSampleFrames-- > 0) {
 		inputSample = *sourceP;
@@ -378,19 +373,11 @@ void		FromTape::FromTapeKernel::Process(	const Float32 	*inSourceP,
 			inputSample = (inputSample * wet) + (drySample * dry);
 		}
 		
-		//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/FromTape/FromTape.h b/plugins/MacAU/FromTape/FromTape.h
index f79862f..e9156d5 100755
--- a/plugins/MacAU/FromTape/FromTape.h
+++ b/plugins/MacAU/FromTape/FromTape.h
@@ -169,9 +169,7 @@ public:
 		Float64 iirSampleZ;
 		int flip;
 		
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;
+		long double fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.pbxuser
index a9b7fe9..3594710 100755
--- a/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.pbxuser
@@ -49,27 +49,28 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528456291;
-			PBXWorkspaceStateSaveDate = 528456291;
+			PBXPerProjectTemplateStateSaveDate = 569646762;
+			PBXWorkspaceStateSaveDate = 569646762;
 		};
 		perUserProjectItems = {
-			8B2B77731F6D6F8D00A2CD5B /* PBXTextBookmark */ = 8B2B77731F6D6F8D00A2CD5B /* PBXTextBookmark */;
+			8B792C7021F41F11006E9731 /* PlistBookmark */ = 8B792C7021F41F11006E9731 /* PlistBookmark */;
 			8B8845F81F20429900E13453 /* PlistBookmark */ = 8B8845F81F20429900E13453 /* PlistBookmark */;
-			8B9D743A1F7F9A77007AB60F /* PBXTextBookmark */ = 8B9D743A1F7F9A77007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B2B77731F6D6F8D00A2CD5B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* FromTape.h */;
-		name = "FromTape.h: 172";
-		rLen = 65;
-		rLoc = 6216;
-		rType = 0;
-		vrLen = 40;
-		vrLoc = 6241;
+	8B792C7021F41F11006E9731 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 8D01CCD10486CAD60068D4B7 /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+			CFBundleName,
+		);
+		name = /Users/christopherjohnson/Desktop/MacAU/FromTape/Info.plist;
+		rLen = 0;
+		rLoc = 9223372036854775807;
 	};
 	8B8845F81F20429900E13453 /* PlistBookmark */ = {
 		isa = PlistBookmark;
@@ -83,22 +84,12 @@
 		rLen = 0;
 		rLoc = 9223372036854775808;
 	};
-	8B9D743A1F7F9A77007AB60F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* FromTape.h */;
-		name = "FromTape.h: 172";
-		rLen = 65;
-		rLoc = 6216;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
 	8BA05A660720730100365D66 /* FromTape.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {663, 5291}}";
-			sepNavSelRange = "{17764, 148}";
-			sepNavVisRange = "{0, 0}";
-			sepNavWindowFrame = "{{410, 39}, {1005, 839}}";
+			sepNavIntBoundsRect = "{{0, 0}, {958, 4849}}";
+			sepNavSelRange = "{18025, 0}";
+			sepNavVisRange = "{16126, 1987}";
+			sepNavWindowFrame = "{{208, 39}, {1005, 839}}";
 		};
 	};
 	8BA05A690720730100365D66 /* FromTapeVersion.h */ = {
@@ -111,8 +102,8 @@
 	};
 	8BC6025B073B072D006C4272 /* FromTape.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {482, 2418}}";
-			sepNavSelRange = "{6216, 65}";
+			sepNavIntBoundsRect = "{{0, 0}, {482, 2392}}";
+			sepNavSelRange = "{6238, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{238, 39}, {1005, 839}}";
 		};
diff --git a/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.perspectivev3
index 9ea14ce..dbd983d 100755
--- a/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/FromTape/FromTape.xcodeproj/christopherjohnson.perspectivev3
@@ -256,8 +256,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -341,7 +339,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>8BD7274A1D46E5A5000176F0</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>FromTape.h</string>
+								<string>Info.plist</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -349,15 +347,14 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>8BD7274B1D46E5A5000176F0</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>FromTape.h</string>
+										<string>Info.plist</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D743A1F7F9A77007AB60F</string>
+										<string>8B792C7021F41F11006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B8845F81F20429900E13453</string>
-											<string>8B2B77731F6D6F8D00A2CD5B</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -397,8 +394,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {531, 581}}</string>
-										<key>RubberWindowFrame</key>
-										<string>187 187 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -452,7 +447,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 525}}</string>
+										<string>{{10, 27}, {531, 581}}</string>
+										<key>RubberWindowFrame</key>
+										<string>187 187 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -480,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D743B1F7F9A77007AB60F</string>
+				<string>8B792C7121F41F11006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D743C1F7F9A77007AB60F</string>
+				<string>8B792C7221F41F11006E9731</string>
 				<string>8BD7274A1D46E5A5000176F0</string>
-				<string>8B9D743D1F7F9A77007AB60F</string>
+				<string>8B792C7321F41F11006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -657,7 +654,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528456311.18495703</real>
+	<real>569646865.43937504</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -674,7 +671,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D743E1F7F9A77007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/FromTape/FromTape.xcodeproj</string>
 	</array>
 	<key>WindowString</key>