aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johnson <jinx6568@sover.net>2019-10-13 19:28:55 -0400
committerChris Johnson <jinx6568@sover.net>2019-10-13 19:28:55 -0400
commit1340c990ffe6e09462eb6edba892cd06d0e3dc3c (patch)
tree9b574e882edfebd712dbd1b76f20443b718f7a29
parentb8b547a33a79a9bea1b4077aa0fbc722f98abc6f (diff)
downloadairwindows-lv2-port-1340c990ffe6e09462eb6edba892cd06d0e3dc3c.tar.gz
airwindows-lv2-port-1340c990ffe6e09462eb6edba892cd06d0e3dc3c.tar.bz2
airwindows-lv2-port-1340c990ffe6e09462eb6edba892cd06d0e3dc3c.zip
Monitoring (redux)
-rwxr-xr-xplugins/LinuxVST/src/Monitoring/Monitoring.cpp12
-rwxr-xr-xplugins/LinuxVST/src/Monitoring/MonitoringProc.cpp62
-rwxr-xr-xplugins/MacAU/Monitoring/Monitoring.cpp39
-rwxr-xr-xplugins/MacAU/Monitoring/Monitoring.h14
-rwxr-xr-xplugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser67
-rwxr-xr-xplugins/MacAU/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev339
-rwxr-xr-xplugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser50
-rwxr-xr-xplugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev346
-rwxr-xr-xplugins/MacVST/Monitoring/source/Monitoring.cpp12
-rwxr-xr-xplugins/MacVST/Monitoring/source/MonitoringProc.cpp62
-rwxr-xr-xplugins/WinVST/Monitoring/.vs/VSTProject/v14/.suobin23040 -> 22528 bytes
-rwxr-xr-xplugins/WinVST/Monitoring/Monitoring.cpp12
-rwxr-xr-xplugins/WinVST/Monitoring/MonitoringProc.cpp62
13 files changed, 323 insertions, 154 deletions
diff --git a/plugins/LinuxVST/src/Monitoring/Monitoring.cpp b/plugins/LinuxVST/src/Monitoring/Monitoring.cpp
index 124af48..f7cefe1 100755
--- a/plugins/LinuxVST/src/Monitoring/Monitoring.cpp
+++ b/plugins/LinuxVST/src/Monitoring/Monitoring.cpp
@@ -135,7 +135,7 @@ void Monitoring::getParameterName(VstInt32 index, char *text) {
void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
switch (index) {
- case kParamA: switch((VstInt32)( A * 11.999 )) //0 to almost edge of # of params
+ case kParamA: switch((VstInt32)( A * 15.999 )) //0 to almost edge of # of params
{ case 0: vst_strncpy (text, "Out24", kVstMaxParamStrLen); break;
case 1: vst_strncpy (text, "Out16", kVstMaxParamStrLen); break;
case 2: vst_strncpy (text, "Peaks", kVstMaxParamStrLen); break;
@@ -145,9 +145,13 @@ void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
case 6: vst_strncpy (text, "Side", kVstMaxParamStrLen); break;
case 7: vst_strncpy (text, "Vinyl", kVstMaxParamStrLen); break;
case 8: vst_strncpy (text, "Aurat", kVstMaxParamStrLen); break;
- case 9: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
- case 10: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
- case 11: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 9: vst_strncpy (text, "MonoRat", kVstMaxParamStrLen); break;
+ case 10: vst_strncpy (text, "MonoLat", kVstMaxParamStrLen); break;
+ case 11: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
+ case 12: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
+ case 13: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 14: vst_strncpy (text, "Cans C", kVstMaxParamStrLen); break;
+ case 15: vst_strncpy (text, "Cans D", kVstMaxParamStrLen); break;
default: break; // unknown parameter, shouldn't happen!
} break;
default: break; // unknown parameter, shouldn't happen!
diff --git a/plugins/LinuxVST/src/Monitoring/MonitoringProc.cpp b/plugins/LinuxVST/src/Monitoring/MonitoringProc.cpp
index 297655c..db51380 100755
--- a/plugins/LinuxVST/src/Monitoring/MonitoringProc.cpp
+++ b/plugins/LinuxVST/src/Monitoring/MonitoringProc.cpp
@@ -18,16 +18,16 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
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 == 8) {biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575;}
- if (processing == 9) {biquad[0] = 0.1245/overallscale; biquad[1] = 0.46;}
+ biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575; //define as AURAT, MONORAT, MONOLAT unless overridden
+ if (processing == 7) {biquad[0] = 0.0385/overallscale; biquad[1] = 0.0825;}
+ if (processing == 11) {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);
biquad[2] = K / biquad[1] * norm;
@@ -289,7 +289,14 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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
@@ -309,8 +316,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -324,8 +333,11 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -339,8 +351,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -488,7 +502,7 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
@@ -759,7 +773,14 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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
@@ -779,8 +800,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -794,8 +817,11 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -809,8 +835,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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.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>
diff --git a/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
index ddb8cd7..bcff55a 100755
--- a/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.pbxuser
@@ -49,8 +49,12 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 589663780;
- PBXWorkspaceStateSaveDate = 589663780;
+ PBXPerProjectTemplateStateSaveDate = 592088736;
+ PBXWorkspaceStateSaveDate = 592088736;
+ };
+ perUserProjectItems = {
+ 8B120FF1234A8EEE00C990C9 /* PBXTextBookmark */ = 8B120FF1234A8EEE00C990C9 /* PBXTextBookmark */;
+ 8BB29AD0234A4F71003B3A8E /* PBXTextBookmark */ = 8BB29AD0234A4F71003B3A8E /* PBXTextBookmark */;
};
sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
userBuildSettings = {
@@ -58,18 +62,18 @@
};
2407DEB6089929BA00EB68BF /* Monitoring.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1230, 2223}}";
- sepNavSelRange = "{5144, 24}";
- sepNavVisRange = "{4229, 2265}";
- sepNavWindowFrame = "{{12, 57}, {895, 821}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1230, 2197}}";
+ sepNavSelRange = "{6256, 0}";
+ sepNavVisRange = "{4822, 2491}";
+ sepNavWindowFrame = "{{510, 57}, {895, 821}}";
};
};
245463B80991757100464AD3 /* Monitoring.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {866, 1105}}";
+ sepNavIntBoundsRect = "{{0, 0}, {901, 1118}}";
sepNavSelRange = "{3361, 0}";
- sepNavVisRange = "{0, 2396}";
- sepNavWindowFrame = "{{20, 57}, {895, 821}}";
+ sepNavVisRange = "{694, 2836}";
+ sepNavWindowFrame = "{{528, 57}, {895, 821}}";
};
};
24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = {
@@ -82,10 +86,10 @@
};
24D8286F09A914000093AEF8 /* MonitoringProc.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {992, 21411}}";
- sepNavSelRange = "{32543, 0}";
- sepNavVisRange = "{31463, 3401}";
- sepNavWindowFrame = "{{81, 57}, {895, 821}}";
+ sepNavIntBoundsRect = "{{0, 0}, {554, 12792}}";
+ sepNavSelRange = "{46745, 0}";
+ sepNavVisRange = "{0, 0}";
+ sepNavWindowFrame = "{{518, 57}, {895, 821}}";
};
};
8B02375E1D42B1C400E1E8C8 /* Source Control */ = {
@@ -102,6 +106,26 @@
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
+ 8B120FF1234A8EEE00C990C9 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 24D8286F09A914000093AEF8 /* MonitoringProc.cpp */;
+ name = "MonitoringProc.cpp: 783";
+ rLen = 0;
+ rLoc = 46745;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 8BB29AD0234A4F71003B3A8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 24D8286F09A914000093AEF8 /* MonitoringProc.cpp */;
+ name = "MonitoringProc.cpp: 782";
+ rLen = 0;
+ rLoc = 46745;
+ rType = 0;
+ vrLen = 25;
+ vrLoc = 27860;
+ };
8D01CCC60486CAD60068D4B7 /* Monitoring */ = {
activeExec = 0;
};
diff --git a/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
index 6148e7f..e9adff3 100755
--- a/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Monitoring/Monitoring.xcodeproj/christopherjohnson.perspectivev3
@@ -256,6 +256,8 @@
<key>Layout</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -298,7 +300,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>5</integer>
+ <integer>6</integer>
<integer>4</integer>
<integer>0</integer>
</array>
@@ -321,7 +323,7 @@
<real>185</real>
</array>
<key>RubberWindowFrame</key>
- <string>25 342 810 487 0 0 1440 878 </string>
+ <string>246 279 810 487 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -337,7 +339,7 @@
<key>PBXProjectModuleGUID</key>
<string>8B0237581D42B1C400E1E8C8</string>
<key>PBXProjectModuleLabel</key>
- <string>Gain.h</string>
+ <string>MonitoringProc.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -345,7 +347,15 @@
<key>PBXProjectModuleGUID</key>
<string>8B0237591D42B1C400E1E8C8</string>
<key>PBXProjectModuleLabel</key>
- <string>Gain.h</string>
+ <string>MonitoringProc.cpp</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>8B120FF1234A8EEE00C990C9</string>
+ <key>history</key>
+ <array>
+ <string>8BB29AD0234A4F71003B3A8E</string>
+ </array>
</dict>
<key>SplitCount</key>
<string>1</string>
@@ -358,18 +368,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {603, 0}}</string>
+ <string>{{0, 0}, {603, 32}}</string>
<key>RubberWindowFrame</key>
- <string>25 342 810 487 0 0 1440 878 </string>
+ <string>246 279 810 487 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>0pt</string>
+ <string>32pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>441pt</string>
+ <string>409pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -383,7 +393,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {603, 414}}</string>
+ <string>{{10, 27}, {603, 382}}</string>
+ <key>RubberWindowFrame</key>
+ <string>246 279 810 487 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -438,8 +450,6 @@
<dict>
<key>Frame</key>
<string>{{10, 27}, {603, 414}}</string>
- <key>RubberWindowFrame</key>
- <string>25 342 810 487 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -467,11 +477,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>8B0DB63723259214007D41E7</string>
+ <string>8B120FF2234A8EEE00C990C9</string>
<string>1CA23ED40692098700951B8B</string>
- <string>8B0DB63823259214007D41E7</string>
+ <string>8B120FF3234A8EEE00C990C9</string>
<string>8B0237581D42B1C400E1E8C8</string>
- <string>8B0DB63923259214007D41E7</string>
+ <string>8B120FF4234A8EEE00C990C9</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -624,7 +634,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>589664788.96294105</real>
+ <real>592088814.93142998</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@@ -641,11 +651,11 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>8B0DB63A23259214007D41E7</string>
- <string>/Users/christopherjohnson/Desktop/Monitoring/Monitoring.xcodeproj</string>
+ <string>8B120FF5234A8EEE00C990C9</string>
+ <string>/Users/christopherjohnson/Desktop/Plugins/MacVST/Monitoring/Monitoring.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>25 342 810 487 0 0 1440 878 </string>
+ <string>246 279 810 487 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
diff --git a/plugins/MacVST/Monitoring/source/Monitoring.cpp b/plugins/MacVST/Monitoring/source/Monitoring.cpp
index 124af48..f7cefe1 100755
--- a/plugins/MacVST/Monitoring/source/Monitoring.cpp
+++ b/plugins/MacVST/Monitoring/source/Monitoring.cpp
@@ -135,7 +135,7 @@ void Monitoring::getParameterName(VstInt32 index, char *text) {
void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
switch (index) {
- case kParamA: switch((VstInt32)( A * 11.999 )) //0 to almost edge of # of params
+ case kParamA: switch((VstInt32)( A * 15.999 )) //0 to almost edge of # of params
{ case 0: vst_strncpy (text, "Out24", kVstMaxParamStrLen); break;
case 1: vst_strncpy (text, "Out16", kVstMaxParamStrLen); break;
case 2: vst_strncpy (text, "Peaks", kVstMaxParamStrLen); break;
@@ -145,9 +145,13 @@ void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
case 6: vst_strncpy (text, "Side", kVstMaxParamStrLen); break;
case 7: vst_strncpy (text, "Vinyl", kVstMaxParamStrLen); break;
case 8: vst_strncpy (text, "Aurat", kVstMaxParamStrLen); break;
- case 9: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
- case 10: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
- case 11: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 9: vst_strncpy (text, "MonoRat", kVstMaxParamStrLen); break;
+ case 10: vst_strncpy (text, "MonoLat", kVstMaxParamStrLen); break;
+ case 11: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
+ case 12: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
+ case 13: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 14: vst_strncpy (text, "Cans C", kVstMaxParamStrLen); break;
+ case 15: vst_strncpy (text, "Cans D", kVstMaxParamStrLen); break;
default: break; // unknown parameter, shouldn't happen!
} break;
default: break; // unknown parameter, shouldn't happen!
diff --git a/plugins/MacVST/Monitoring/source/MonitoringProc.cpp b/plugins/MacVST/Monitoring/source/MonitoringProc.cpp
index 297655c..db51380 100755
--- a/plugins/MacVST/Monitoring/source/MonitoringProc.cpp
+++ b/plugins/MacVST/Monitoring/source/MonitoringProc.cpp
@@ -18,16 +18,16 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
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 == 8) {biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575;}
- if (processing == 9) {biquad[0] = 0.1245/overallscale; biquad[1] = 0.46;}
+ biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575; //define as AURAT, MONORAT, MONOLAT unless overridden
+ if (processing == 7) {biquad[0] = 0.0385/overallscale; biquad[1] = 0.0825;}
+ if (processing == 11) {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);
biquad[2] = K / biquad[1] * norm;
@@ -289,7 +289,14 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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
@@ -309,8 +316,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -324,8 +333,11 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -339,8 +351,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -488,7 +502,7 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
@@ -759,7 +773,14 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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
@@ -779,8 +800,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -794,8 +817,11 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -809,8 +835,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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/WinVST/Monitoring/.vs/VSTProject/v14/.suo b/plugins/WinVST/Monitoring/.vs/VSTProject/v14/.suo
index c651f77..6d8080e 100755
--- a/plugins/WinVST/Monitoring/.vs/VSTProject/v14/.suo
+++ b/plugins/WinVST/Monitoring/.vs/VSTProject/v14/.suo
Binary files differ
diff --git a/plugins/WinVST/Monitoring/Monitoring.cpp b/plugins/WinVST/Monitoring/Monitoring.cpp
index 124af48..f7cefe1 100755
--- a/plugins/WinVST/Monitoring/Monitoring.cpp
+++ b/plugins/WinVST/Monitoring/Monitoring.cpp
@@ -135,7 +135,7 @@ void Monitoring::getParameterName(VstInt32 index, char *text) {
void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
switch (index) {
- case kParamA: switch((VstInt32)( A * 11.999 )) //0 to almost edge of # of params
+ case kParamA: switch((VstInt32)( A * 15.999 )) //0 to almost edge of # of params
{ case 0: vst_strncpy (text, "Out24", kVstMaxParamStrLen); break;
case 1: vst_strncpy (text, "Out16", kVstMaxParamStrLen); break;
case 2: vst_strncpy (text, "Peaks", kVstMaxParamStrLen); break;
@@ -145,9 +145,13 @@ void Monitoring::getParameterDisplay(VstInt32 index, char *text) {
case 6: vst_strncpy (text, "Side", kVstMaxParamStrLen); break;
case 7: vst_strncpy (text, "Vinyl", kVstMaxParamStrLen); break;
case 8: vst_strncpy (text, "Aurat", kVstMaxParamStrLen); break;
- case 9: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
- case 10: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
- case 11: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 9: vst_strncpy (text, "MonoRat", kVstMaxParamStrLen); break;
+ case 10: vst_strncpy (text, "MonoLat", kVstMaxParamStrLen); break;
+ case 11: vst_strncpy (text, "Phone", kVstMaxParamStrLen); break;
+ case 12: vst_strncpy (text, "Cans A", kVstMaxParamStrLen); break;
+ case 13: vst_strncpy (text, "Cans B", kVstMaxParamStrLen); break;
+ case 14: vst_strncpy (text, "Cans C", kVstMaxParamStrLen); break;
+ case 15: vst_strncpy (text, "Cans D", kVstMaxParamStrLen); break;
default: break; // unknown parameter, shouldn't happen!
} break;
default: break; // unknown parameter, shouldn't happen!
diff --git a/plugins/WinVST/Monitoring/MonitoringProc.cpp b/plugins/WinVST/Monitoring/MonitoringProc.cpp
index 297655c..db51380 100755
--- a/plugins/WinVST/Monitoring/MonitoringProc.cpp
+++ b/plugins/WinVST/Monitoring/MonitoringProc.cpp
@@ -18,16 +18,16 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
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 == 8) {biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575;}
- if (processing == 9) {biquad[0] = 0.1245/overallscale; biquad[1] = 0.46;}
+ biquad[0] = 0.0375/overallscale; biquad[1] = 0.1575; //define as AURAT, MONORAT, MONOLAT unless overridden
+ if (processing == 7) {biquad[0] = 0.0385/overallscale; biquad[1] = 0.0825;}
+ if (processing == 11) {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);
biquad[2] = K / biquad[1] * norm;
@@ -289,7 +289,14 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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
@@ -309,8 +316,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -324,8 +333,11 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -339,8 +351,10 @@ void Monitoring::processReplacing(float **inputs, float **outputs, VstInt32 samp
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;
@@ -488,7 +502,7 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
overallscale /= 44100.0;
overallscale *= getSampleRate();
- int processing = (VstInt32)( A * 11.999 );
+ int processing = (VstInt32)( A * 15.999 );
int am = (int)149.0 * overallscale;
int bm = (int)179.0 * overallscale;
int cm = (int)191.0 * overallscale;
@@ -759,7 +773,14 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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
@@ -779,8 +800,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -794,8 +817,11 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;
@@ -809,8 +835,10 @@ void Monitoring::processDoubleReplacing(double **inputs, double **outputs, VstIn
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;