small updates

version bump (0.4.3.2)- notarization and signing updates for catalina

Author: mrRay

MIDIOSCQueryHelper/Info.plist

@@ -34,9 +34,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.3.0</string>
+	<string>0.4.3.2</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.3.0</string>
+	<string>0.4.3.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

MIDIOSCQueryHelper/MIDIOSCQueryHelperAppDelegate.h

@@ -4,11 +4,12 @@
 #import "MOQHMIDIManager.h"
 #import "VVKQueueCenter.h"
 
-@interface MIDIOSCQueryHelperAppDelegate : NSObject <NSApplicationDelegate,VVOSCQueryServerDelegate,VVKQueueCenterDelegate>	{
+@interface MIDIOSCQueryHelperAppDelegate : NSObject <NSApplicationDelegate,VVOSCQueryServerDelegate,VVKQueueCenterDelegate,VVMIDIDelegateProtocol>	{
 	IBOutlet MOQHOSCManager		*oscm;	//	osc manager- creates an OSC input, messages sent to that input are dispatched to the address space
 	IBOutlet MOQHMIDIManager	*midim;	//	midi manager- creates a virtual destination (appears as a device to other apps) and also lets the user select a destination.  MIDI messages will be sent to both.
 
 	NSMutableArray			*delegates;	//	array of QueryServerNodeDelegate instances.  each of these is a delegate of an OSCNode (the node gets a message and passes it to its delegate)
+	NSMutableDictionary		*midiAddressToOSCAddressDict;	//	key is MIDI address, value is an NSMutableArray containing the OSC addresses that correspond to the key
 
 	NSString				*loadedFilePath;	//	the path of the currently loaded file.
 	IBOutlet NSTextField 	*fileStatusField;	//	this displays the name of the currently-loaded file in the UI

MIDIOSCQueryHelper/MIDIOSCQueryHelperAppDelegate.m

@@ -55,6 +55,7 @@ - (id) init	{
 		[[NSNotificationCenter defaultCenter] removeObserver:as name:NSApplicationWillTerminateNotification object:nil];
 
 		delegates = [[NSMutableArray alloc] init];
+		midiAddressToOSCAddressDict = [[NSMutableDictionary alloc] init];
 		loadedFilePath = nil;
 		fileChangeCoalesceTimer = nil;
 
@@ -75,6 +76,9 @@ - (id) init	{
 	}
 	return self;
 }
+- (void) awakeFromNib	{
+	[self->midim setDelegate:self];
+}
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 	//	check to see if there's a "SampleDocument.json" in ~/Documents/OSCQuery Helper
 	NSFileManager		*fm = [NSFileManager defaultManager];
@@ -117,6 +121,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification {
 		[as removeDelegate:tmpDelegate forPath:[tmpDelegate address]];
 	}
 	[delegates removeAllObjects];
+	[midiAddressToOSCAddressDict removeAllObjects];
 }
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename	{
 	NSLog(@"%s ... %@",__func__,filename);
@@ -324,6 +329,9 @@ - (BOOL) _loadAbletonProject:(NSString *)fullPath	{
 	}
 	[delegates removeAllObjects];
 
+	//	clear out the midi-address-to-osc-address mapping dict
+	[midiAddressToOSCAddressDict removeAllObjects];
+	
 	//	clear out the OSC address space
 	NSArray		*baseNodes = [[as nodeContents] lockCreateArrayCopy];
 	for (OSCNode *baseNode in baseNodes)	{
@@ -436,6 +444,14 @@ - (BOOL) _loadAbletonProject:(NSString *)fullPath	{
 			}
 			[newNode addDelegate:tmpDelegate];
 			[self->delegates addObject:tmpDelegate];
+			
+			NSMutableArray		*tmpArray = nil;
+			tmpArray = [self->midiAddressToOSCAddressDict objectForKey:[tmpDelegate midiTypeAsString]];
+			if (tmpArray == nil)	{
+				tmpArray = [[NSMutableArray alloc] init];
+				[self->midiAddressToOSCAddressDict setObject:tmpArray forKey:[tmpDelegate midiTypeAsString]];
+			}
+			[tmpArray addObject:objFullPath];
 		}
 
 		//	run through the contents, calling this block recursively on each object
@@ -495,6 +511,9 @@ - (BOOL) _loadJSONFile:(NSString *)fullPath	{
 	}
 	[delegates removeAllObjects];
 
+	//	clear out the midi-address-to-osc-address mapping dict
+	[midiAddressToOSCAddressDict removeAllObjects];
+	
 	//	clear out the OSC address space
 	NSArray		*baseNodes = [[as nodeContents] lockCreateArrayCopy];
 	for (OSCNode *baseNode in baseNodes)	{
@@ -570,7 +589,7 @@ - (BOOL) _loadJSONFile:(NSString *)fullPath	{
 				[newNode setExtendedType:objExtType];
 			//if (objAccess != nil && [objAccess isKindOfClass:[NSNumber class]])	{
 				//[newNode setAccess:[objAccess intValue]];	//	don't do this, access is always write-only in this application (we can't read the remote app's OSC address space)
-				[newNode setAccess:2];
+				[newNode setAccess:3];
 			//}
 			if (objRange != nil && [objRange isKindOfClass:[NSArray class]])
 				[newNode setRange:objRange];
@@ -601,6 +620,14 @@ - (BOOL) _loadJSONFile:(NSString *)fullPath	{
 			}
 			[newNode addDelegate:tmpDelegate];
 			[self->delegates addObject:tmpDelegate];
+			
+			NSMutableArray		*tmpArray = nil;
+			tmpArray = [self->midiAddressToOSCAddressDict objectForKey:[tmpDelegate midiTypeAsString]];
+			if (tmpArray == nil)	{
+				tmpArray = [[NSMutableArray alloc] init];
+				[self->midiAddressToOSCAddressDict setObject:tmpArray forKey:[tmpDelegate midiTypeAsString]];
+			}
+			[tmpArray addObject:baseObjPath];
 		}
 
 		//	run through the contents, calling this block recursively on each object
@@ -699,6 +726,111 @@ - (void) targetAppHostInfoChangedNotification:(NSNotification *)note	{
 }
 
 
+#pragma mark -------------------------- VVMIDIDelegate
+
+
+- (void) setupChanged	{
+	//NSLog(@"%s",__func__);
+}
+- (void) receivedMIDI:(NSArray *)a fromNode:(VVMIDINode *)n	{
+	//if ([a count]==1)
+	//	NSLog(@"%s ... %@, %@",__func__,[a objectAtIndex:0],n);
+	//else
+	//	NSLog(@"%s ... %@, %@",__func__,a,n);
+	
+	OSCAddressSpace		*as = [OSCAddressSpace mainAddressSpace];
+	//	run through the midi messages
+	for (VVMIDIMessage *msg in a)	{
+		//	create a midi string that describes the msg- this is the key in 'midiAddressToOSCAddressDict'
+		NSString		*midiMsgKey = [QueryServerNodeDelegate stringForMidiChannel:[msg channel] type:[msg type] voice:[msg data1]];
+		//	get the array of osc destinations that correspond to this address- run through each osc destination
+		NSArray			*oscDests = [midiAddressToOSCAddressDict objectForKey:midiMsgKey];
+		//	get a normalized double value for the MIDI message, we'll use it later to calculate a non-normalized val
+		double			normMIDIVal = [msg doubleValue];
+		
+		//	run through every OSC address that this MIDI address is associated with
+		for (NSString *oscDest in oscDests)	{
+			//	get the OSC node for this address
+			OSCNode			*tmpNode = [as findNodeForAddress:oscDest createIfMissing:NO];
+			if (tmpNode == nil)
+				continue;
+			//	make a new OSC message- this is what we're going to populate, and dispatch to the server
+			OSCMessage		*newMsg = [OSCMessage createWithAddress:oscDest];
+			NSArray			*ranges = [tmpNode range];
+			NSDictionary	*range = (ranges==nil || [ranges count]!=1) ? nil : [ranges objectAtIndex:0];
+			double			nonNormVal = normMIDIVal;
+			if (range == nil)	{
+				nonNormVal = normMIDIVal;
+			}
+			else	{
+				NSNumber		*tmpMin = [range objectForKey:@"MIN"];
+				NSNumber		*tmpMax = [range objectForKey:@"MAX"];
+				if (tmpMin == nil || tmpMax == nil)	{
+					nonNormVal = normMIDIVal;
+				}
+				else	{
+					double			tmpMinVal = [tmpMin doubleValue];
+					double			tmpMaxVal = [tmpMax doubleValue];
+					nonNormVal = (normMIDIVal * (tmpMaxVal-tmpMinVal)) + tmpMinVal;
+				}
+			}
+			NSString		*nodeType = [tmpNode typeTagString];
+			unichar			nodeTypeChar = (nodeType==nil) ? 'f' : [nodeType characterAtIndex:0];
+			switch (nodeTypeChar)	{
+			case 'i':
+				[newMsg addInt:(int)nonNormVal];
+				break;
+			case 'f':
+				[newMsg addFloat:(float)nonNormVal];
+				break;
+			//case 's':
+			//case 'S':
+			//	break;
+			case 'd':
+				[newMsg addDouble:nonNormVal];
+				break;
+			//case 'c':
+			//	break;
+			//case 'r':
+			//	break;
+			case 'T':	//	true
+				[newMsg addValue:[OSCValue createWithBool:YES]];
+				break;
+			case 'F':	//	false
+				[newMsg addValue:[OSCValue createWithBool:NO]];
+				break;
+			case 'N':	//	nil
+				[newMsg addValue:[OSCValue createWithNil]];
+				break;
+			case 'I':	//	infinity
+				[newMsg addValue:[OSCValue createWithInfinity]];
+				break;
+			case 'h':	//	64 bit int
+				[newMsg addValue:[OSCValue createWithLongLong:(long long)nonNormVal]];
+				break;
+			case '[':
+			case ']':
+				break;
+			//case 'b':	//	blob
+			//	break;
+			//case 't':	//	time tag
+			//	break;
+			//case 'm':	//	midi
+			//	break;
+			}
+			
+			//	...at this point i've populated the OSC message- pass it back to the query server so anything listening to it will get it
+			
+			OSCPacket		*newPacket = [OSCPacket createWithContent:newMsg];
+			[server
+				sendOSCPacketData:[newPacket payload]
+				sized:[newPacket bufferLength]
+				toClientsListeningToOSCAddress:oscDest];
+		}
+	}
+}
+
+
 #pragma mark -------------------------- VVKQueueCenterDelegate
 
 
@@ -742,7 +874,6 @@ - (VVOSCQueryReply *) hostInfoQueryFromServer:(VVOSCQueryServer *)s	{
 	//	supply an extensions array if there isn't already one
 	NSDictionary		*extDict = @{
 		kVVOSCQ_OptAttr_Tags : @YES,
-		//kVVOSCQ_ReqAttr_Type : @YES,
 		kVVOSCQ_OptAttr_Access : @YES,
 		kVVOSCQ_OptAttr_Value : @YES,
 		kVVOSCQ_OptAttr_Range : @YES,
@@ -751,8 +882,8 @@ - (VVOSCQueryReply *) hostInfoQueryFromServer:(VVOSCQueryServer *)s	{
 		kVVOSCQ_OptAttr_Critical : @NO,
 		kVVOSCQ_OptAttr_Overloads : @NO,
 		kVVOSCQ_OptAttr_HTML : @YES,
-		kVVOSCQ_WSAttr_Cmd_Listen : @NO,
-		kVVOSCQ_WSAttr_Cmd_Ignore : @NO,
+		kVVOSCQ_WSAttr_Cmd_Listen : @YES,
+		kVVOSCQ_WSAttr_Cmd_Ignore : @YES,
 		kVVOSCQ_WSAttr_Cmd_PathChanged : @YES,
 		kVVOSCQ_WSAttr_Cmd_PathRenamed : @NO,
 		kVVOSCQ_WSAttr_Cmd_PathRemoved : @NO,
@@ -800,7 +931,7 @@ - (void) server:(VVOSCQueryServer *)s receivedOSCPacket:(const void*)packet size
 - (BOOL) server:(VVOSCQueryServer *)s wantsToListenTo:(NSString *)address	{
 	//NSLog(@"%s ... %@, %@",__func__,s,address);
 	//	intentionally blank- we can't stream values because we don't have direct access to the remote app's address space (or data model corresponding to an address space)
-	return NO;
+	return YES;
 }
 - (void) server:(VVOSCQueryServer *)s wantsToIgnore:(NSString *)address	{
 	//NSLog(@"%s ... %@, %@",__func__,s,address);

MIDIOSCQueryHelper/MOQHMIDIManager.m

@@ -18,22 +18,6 @@ - (void) awakeFromNib	{
 		lastSelectedName = tmpString;
 	}
 }
-- (void) createVirtualNodes	{
-	//NSLog(@"%s",__func__);
-	
-	//	we only want to create the "sender" virtual node (the one that pretends i'm a "MIDI device")
-	
-	/*
-		make the sender- this node "owns" the destination: it is responsible for telling
-		any endpoints connected to this destination that it has received midi data
-	*/
-	if (virtualDest != nil)	{
-		virtualDest = nil;
-	}
-	virtualDest = [[[self sendingNodeClass] alloc] initSenderWithName:[self sendingNodeName]];
-	if (virtualDest != nil)
-		[virtualDest setDelegate:self];
-}
 - (void) setupChanged	{
 	//NSLog(@"%s",__func__);
 	[super setupChanged];

MIDIOSCQueryHelper/QueryServerNodeDelegate.h

@@ -27,6 +27,8 @@
 	double				maxVal;
 }
 
++ (NSString *) stringForMidiChannel:(int)mc type:(VVMIDIMsgType)mt voice:(int)mv;
+
 - (id) initWithMIDIManager:(VVMIDIManager *)n forAddress:(NSString *)a;
 
 //	once we compose a VVMIDIMessage, pass it to this method to dispatch it to the appropriate MIDI devices
@@ -44,4 +46,6 @@
 @property BOOL hasMax;
 @property double maxVal;
 
+- (NSString *) midiTypeAsString;
+
 @end

MIDIOSCQueryHelper/QueryServerNodeDelegate.m

@@ -74,7 +74,8 @@ - (void) node:(id)n receivedOSCMessage:(OSCMessage *)msg	{
 		}
 		else	{
 			msgNormVal = [oscVal calculateDoubleValue];
-			msgIntVal = [oscVal calculateIntValue];
+			//msgIntVal = [oscVal calculateIntValue];
+			msgIntVal = msgNormVal * 127.0;
 		}
 		break;
 	case OSCValBool:
@@ -180,4 +181,88 @@ - (void) nodeDeleted:(id)node	{
 @synthesize maxVal;
 
 
++ (NSString *) stringForMidiChannel:(int)mc type:(VVMIDIMsgType)mt voice:(int)mv	{
+	switch (mt)	{
+		//	status byte
+		case VVMIDINoteOffVal:
+		case VVMIDINoteOnVal:
+			return [NSString stringWithFormat:@"ch.%hhd,Note%hhd",mc+1,mv];
+			break;
+		case VVMIDIAfterTouchVal:
+			return [NSString stringWithFormat:@"ch.%hhd,Aftertouch",mc+1];
+			break;
+		case VVMIDIControlChangeVal:
+			return [NSString stringWithFormat:@"ch.%hhd,CC%hhd",mc+1,mv];
+			break;
+		case VVMIDIProgramChangeVal:
+			return [NSString stringWithFormat:@"ch.%hhd,PgmChg",mc+1];
+			break;
+		case VVMIDIChannelPressureVal:
+			return [NSString stringWithFormat:@"ch.%hhd,ChPrs",mc+1];
+			break;
+		case VVMIDIPitchWheelVal:
+			return [NSString stringWithFormat:@"ch.%hhd,PtchWhl",mc+1];
+			break;
+		//	common messages
+		case VVMIDIMTCQuarterFrameVal:
+			return [NSString stringWithFormat:@"ch.%hhd,QrtrFrm",mc+1];
+			break;
+		case VVMIDISongPosPointerVal:
+			return [NSString stringWithFormat:@"ch.%hhd,SPP",mc+1];
+			break;
+		case VVMIDISongSelectVal:
+			return [NSString stringWithFormat:@"ch.%hhd,SS",mc+1];
+			break;
+		case VVMIDIUndefinedCommon1Val:
+			return @"Undefined common";
+			break;
+		case VVMIDIUndefinedCommon2Val:
+			return @"Undefined common 2";
+			break;
+		case VVMIDITuneRequestVal:
+			return @"Tune Request";
+			break;
+		//	sysex!
+		case VVMIDIBeginSysexDumpVal:
+			return @"Sysex";
+			break;
+		//	realtime messages- insert these immediately
+		case VVMIDIClockVal:
+			return @"Clock";
+			break;
+		case VVMIDITickVal:
+			return @"Tick";
+			break;
+		case VVMIDIStartVal:
+			return @"Start";
+			break;
+		case VVMIDIContinueVal:
+			return @"Continue";
+			break;
+		case VVMIDIStopVal:
+			return @"Stop";
+			break;
+		case VVMIDIUndefinedRealtime1Val:
+			return @"Undefined Realtime";
+			break;
+		case VVMIDIActiveSenseVal:
+			return @"Active Sense";
+			break;
+		case VVMIDIResetVal:
+			return @"MIDI Reset";
+			break;
+		case VVMIDIMsgUnknown:
+			return @"Unkn";
+			break;
+		case VVMIDIEndSysexDumpVal:
+			return @"SysexEnd";
+			break;
+	}
+	return @"???";
+}
+- (NSString *) midiTypeAsString	{
+	return [QueryServerNodeDelegate stringForMidiChannel:midiChannel type:midiMsgType voice:midiVoice];
+}
+
+
 @end