Monitoring (redux)

4 files changed, 99 insertions, 60 deletions

diff --git a/plugins/MacAU/Monitoring/Monitoring.cpp b/plugins/MacAU/Monitoring/Monitoring.cpp
index eadf110..1a9cc9a 100755
--- a/plugins/MacAU/Monitoring/Monitoring.cpp
+++ b/plugins/MacAU/Monitoring/Monitoring.cpp
@@ -89,9 +89,13 @@ ComponentResult			Monitoring::GetParameterValueStrings(AudioUnitScope		inScope,
 			kMenuItem_SIDE,
 			kMenuItem_VINYL,
 			kMenuItem_AURAT,
+			kMenuItem_MONORAT,
+			kMenuItem_MONOLAT,
 			kMenuItem_PHONE,
 			kMenuItem_CANSA,
-			kMenuItem_CANSB
+			kMenuItem_CANSB,
+			kMenuItem_CANSC,
+			kMenuItem_CANSD
 		};
 		*outStrings = CFArrayCreate (
 									 NULL,
@@ -125,7 +129,7 @@ ComponentResult			Monitoring::GetParameterInfo(AudioUnitScope		inScope,
                 AUBase::FillInParameterName (outParameterInfo, kParameterOneName, false);
 				outParameterInfo.unit = kAudioUnitParameterUnit_Indexed;
                 outParameterInfo.minValue = kNJAD;
-                outParameterInfo.maxValue = kCANSB;
+                outParameterInfo.maxValue = kCANSD;
                 outParameterInfo.defaultValue = kDefaultValue_ParamOne;
                 break;
            default:
@@ -272,8 +276,8 @@ OSStatus		Monitoring::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFl
 	int dm = (int)223.0 * overallscale; //these are 'good' primes, spacing out the allpasses
 	int allpasstemp;
 	//for PeaksOnly
-	biquad[0] = 0.0385/overallscale; biquad[1] = 0.0825; //define as VINYL unless overridden
-	if (processing == kAURAT) {biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575;}
+	biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575; //define as AURAT, MONORAT, MONOLAT unless overridden
+	if (processing == kVINYL) {biquad[0] = 0.0385/overallscale; biquad[1] = 0.0825;}
 	if (processing == kPHONE) {biquad[0] = 0.1245/overallscale; biquad[1] = 0.46;}	
 	double K = tan(M_PI * biquad[0]);
 	double norm = 1.0 / (1.0 + K / biquad[1] + K * K);
@@ -535,7 +539,15 @@ OSStatus		Monitoring::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFl
 			case 7:
 			case 8:
 			case 9:
+			case 10:
+			case 11:
 				//Bandpass: changes in EQ are up in the variable defining, not here
+				//7 Vinyl, 8 9 10 Aurat, 11 Phone
+				
+				if (processing == 9) {inputSampleR = (inputSampleL + inputSampleR)*0.5;inputSampleL = 0.0;}
+				if (processing == 10) {inputSampleL = (inputSampleL + inputSampleR)*0.5;inputSampleR = 0.0;}
+				if (processing == 11) {long double M; M = (inputSampleL + inputSampleR)*0.5; inputSampleL = M;inputSampleR = M;}
+				
 				inputSampleL = sin(inputSampleL); inputSampleR = sin(inputSampleR);
 				//encode Console5: good cleanness
 				
@@ -555,8 +567,10 @@ OSStatus		Monitoring::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFl
 				inputSampleL = asin(inputSampleL); inputSampleR = asin(inputSampleR);
 				//amplitude aspect
 				break;
-			case 10:
-			case 11:
+			case 12:
+			case 13:
+			case 14:
+			case 15:
 				inputSampleL = sin(inputSampleL);
 				inputSampleR = sin(inputSampleR);
 				long double drySampleL; drySampleL = inputSampleL;
@@ -570,8 +584,11 @@ OSStatus		Monitoring::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFl
 				inputSampleR += (aR[ax]);
 				//a single Midiverb-style allpass
 				
-				if (processing == 10) {inputSampleL *= 0.125; inputSampleR *= 0.125;}
-				else {inputSampleL *= 0.25; inputSampleR *= 0.25;}
+				if (processing == 12) {inputSampleL *= 0.125; inputSampleR *= 0.125;}
+				if (processing == 13) {inputSampleL *= 0.25; inputSampleR *= 0.25;}
+				if (processing == 14) {inputSampleL *= 0.5; inputSampleR *= 0.5;}
+				if (processing == 15) {drySampleL *= 0.5; drySampleR *= 0.5;}
+				if (processing == 15) {inputSampleL *= 0.5; inputSampleR *= 0.5;}
 				//Cans A suppresses the crossfeed more, Cans B makes it louder
 				
 				drySampleL += inputSampleR;
@@ -585,8 +602,10 @@ OSStatus		Monitoring::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFl
 				inputSampleR += (dR[dx]);
 				//a single Midiverb-style allpass, which is stretching the previous one even more
 				
-				if (processing == 10) {inputSampleL *= 0.5; inputSampleR *= 0.5;}
-				else {inputSampleL *= 0.25; inputSampleR *= 0.25;}
+				if (processing == 12) {inputSampleL *= 0.5; inputSampleR *= 0.5;}
+				if (processing == 13) {inputSampleL *= 0.25; inputSampleR *= 0.25;}
+				if (processing == 14) {inputSampleL *= 0.125; inputSampleR *= 0.125;}
+				if (processing == 15) {inputSampleL *= 0.5; inputSampleR *= 0.5;}
 				//Cans A already had crossfeeds down, bloom is louder. Cans B sits on bloom more
 
 				drySampleL += inputSampleL;
diff --git a/plugins/MacAU/Monitoring/Monitoring.h b/plugins/MacAU/Monitoring/Monitoring.h
index c1b988c..5f959ea 100755
--- a/plugins/MacAU/Monitoring/Monitoring.h
+++ b/plugins/MacAU/Monitoring/Monitoring.h
@@ -64,9 +64,13 @@ static const int kMONO = 5;
 static const int kSIDE = 6;
 static const int kVINYL = 7;
 static const int kAURAT = 8;
-static const int kPHONE = 9;
-static const int kCANSA = 10;
-static const int kCANSB = 11;
+static const int kMONORAT = 9;
+static const int kMONOLAT = 10;
+static const int kPHONE = 11;
+static const int kCANSA = 12;
+static const int kCANSB = 13;
+static const int kCANSC = 14;
+static const int kCANSD = 15;
 static const int kDefaultValue_ParamOne = kNJAD;
 
 static CFStringRef kMenuItem_NJAD = CFSTR ("Out24");
@@ -78,9 +82,13 @@ static CFStringRef kMenuItem_MONO = CFSTR ("Mono");
 static CFStringRef kMenuItem_SIDE = CFSTR ("Side");
 static CFStringRef kMenuItem_VINYL = CFSTR ("Vinyl");
 static CFStringRef kMenuItem_AURAT = CFSTR ("Aurat");
+static CFStringRef kMenuItem_MONORAT = CFSTR ("MonoRat");
+static CFStringRef kMenuItem_MONOLAT = CFSTR ("MonoLat");
 static CFStringRef kMenuItem_PHONE = CFSTR ("Phone");
 static CFStringRef kMenuItem_CANSA = CFSTR ("Cans A");
 static CFStringRef kMenuItem_CANSB = CFSTR ("Cans B");
+static CFStringRef kMenuItem_CANSC = CFSTR ("Cans C");
+static CFStringRef kMenuItem_CANSD = CFSTR ("Cans D");
 
 enum {
 	kParam_One =0,
diff --git a/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
index 15cd6b6..341a8f7 100755
--- a/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
@@ -49,43 +49,34 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 589663801;
-			PBXWorkspaceStateSaveDate = 589663801;
+			PBXPerProjectTemplateStateSaveDate = 592088676;
+			PBXWorkspaceStateSaveDate = 592088676;
 		};
 		perUserProjectItems = {
-			8B0DB63B23259217007D41E7 /* PBXTextBookmark */ = 8B0DB63B23259217007D41E7 /* PBXTextBookmark */;
-			8B0F7B562324976C00FD09FB /* PBXTextBookmark */ = 8B0F7B562324976C00FD09FB /* PBXTextBookmark */;
+			8B120FCF234A8E8700C990C9 /* PBXTextBookmark */ = 8B120FCF234A8E8700C990C9 /* PBXTextBookmark */;
+			8BB29AC5234A4F68003B3A8E /* PBXTextBookmark */ = 8BB29AC5234A4F68003B3A8E /* PBXTextBookmark */;
+			8BB29AC7234A4F68003B3A8E /* PBXTextBookmark */ = 8BB29AC7234A4F68003B3A8E /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B0DB63B23259217007D41E7 /* PBXTextBookmark */ = {
+	8B120FCF234A8E8700C990C9 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* Monitoring.cpp */;
-		name = "Monitoring.cpp: 525";
-		rLen = 0;
-		rLoc = 28517;
-		rType = 0;
-		vrLen = 288;
-		vrLoc = 36944;
-	};
-	8B0F7B562324976C00FD09FB /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* Monitoring.cpp */;
-		name = "Monitoring.cpp: 525";
+		fRef = 8BC6025B073B072D006C4272 /* Monitoring.h */;
+		name = "Monitoring.h: 91";
 		rLen = 0;
-		rLoc = 28517;
+		rLoc = 4257;
 		rType = 0;
-		vrLen = 366;
-		vrLoc = 36944;
+		vrLen = 284;
+		vrLoc = 5176;
 	};
 	8BA05A660720730100365D66 /* Monitoring.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {733, 9477}}";
-			sepNavSelRange = "{28517, 0}";
-			sepNavVisRange = "{36944, 288}";
-			sepNavWindowFrame = "{{691, 65}, {1007, 723}}";
+			sepNavIntBoundsRect = "{{0, 0}, {992, 9698}}";
+			sepNavSelRange = "{31540, 0}";
+			sepNavVisRange = "{30871, 2245}";
+			sepNavWindowFrame = "{{7, 134}, {1007, 723}}";
 		};
 	};
 	8BA05A690720730100365D66 /* MonitoringVersion.h */ = {
@@ -103,12 +94,32 @@
 			sepNavVisRange = "{0, 1336}";
 		};
 	};
+	8BB29AC5234A4F68003B3A8E /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* Monitoring.cpp */;
+		name = "Monitoring.cpp: 529";
+		rLen = 0;
+		rLoc = 28619;
+		rType = 0;
+		vrLen = 388;
+		vrLoc = 3;
+	};
+	8BB29AC7234A4F68003B3A8E /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BC6025B073B072D006C4272 /* Monitoring.h */;
+		name = "Monitoring.h: 91";
+		rLen = 0;
+		rLoc = 4257;
+		rType = 0;
+		vrLen = 286;
+		vrLoc = 5176;
+	};
 	8BC6025B073B072D006C4272 /* Monitoring.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {944, 2119}}";
-			sepNavSelRange = "{3988, 0}";
-			sepNavVisRange = "{2675, 1453}";
-			sepNavWindowFrame = "{{957, 104}, {991, 774}}";
+			sepNavIntBoundsRect = "{{0, 0}, {698, 2301}}";
+			sepNavSelRange = "{4257, 0}";
+			sepNavVisRange = "{5176, 284}";
+			sepNavWindowFrame = "{{127, 28}, {991, 774}}";
 		};
 	};
 	8BD3CCB8148830B20062E48C /* Source Control */ = {
diff --git a/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
index cdc5bc7..e6924d4 100755
--- a/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
@@ -300,7 +300,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>3</integer>
+									<integer>4</integer>
 									<integer>2</integer>
 									<integer>1</integer>
 									<integer>0</integer>
@@ -324,7 +324,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>499 209 810 487 0 0 1440 878 </string>
+						<string>28 275 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -340,7 +340,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>8B6A56BA231E69350074ECF1</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>Monitoring.cpp</string>
+								<string>Monitoring.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -348,14 +348,15 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>8B6A56BB231E69350074ECF1</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>Monitoring.cpp</string>
+										<string>Monitoring.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B0DB63B23259217007D41E7</string>
+										<string>8B120FCF234A8E8700C990C9</string>
 										<key>history</key>
 										<array>
-											<string>8B0F7B562324976C00FD09FB</string>
+											<string>8BB29AC5234A4F68003B3A8E</string>
+											<string>8BB29AC7234A4F68003B3A8E</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -369,18 +370,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 102}}</string>
+								<string>{{0, 0}, {603, 117}}</string>
 								<key>RubberWindowFrame</key>
-								<string>499 209 810 487 0 0 1440 878 </string>
+								<string>28 275 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>102pt</string>
+							<string>117pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>339pt</string>
+							<string>324pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -394,9 +395,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 312}}</string>
+										<string>{{10, 27}, {603, 297}}</string>
 										<key>RubberWindowFrame</key>
-										<string>499 209 810 487 0 0 1440 878 </string>
+										<string>28 275 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -450,7 +451,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 282}}</string>
+										<string>{{10, 27}, {603, 382}}</string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -478,11 +479,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B0DB63C23259217007D41E7</string>
+				<string>8B120FD0234A8E8700C990C9</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B0DB63D23259217007D41E7</string>
+				<string>8B120FD1234A8E8700C990C9</string>
 				<string>8B6A56BA231E69350074ECF1</string>
-				<string>8B0DB63E23259217007D41E7</string>
+				<string>8B120FD2234A8E8700C990C9</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -635,7 +636,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>589664791.49051499</real>
+	<real>592088711.96861303</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -652,11 +653,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B0DB63F23259217007D41E7</string>
+		<string>8B120FD3234A8E8700C990C9</string>
 		<string>/Users/christopherjohnson/Desktop/Plugins/MacAU/Monitoring/Monitoring.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>499 209 810 487 0 0 1440 878 </string>
+	<string>28 275 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>