work on framework

slight API change, the remote server object now supports multiple delegates.  disabled websocket++ logging.  fixed bug with the server that resulted in a crash when a client was disconnecting under some specific circumstances

Author: mrRay

LiveOSCQueryHelper/LiveOSCQueryHelperAppDelegate.m

@@ -209,7 +209,7 @@ - (void) _loadAbletonProjectFile:(NSString *)fullPath	{
 	NSString			*fileName = [[fullPath lastPathComponent] stringByDeletingPathExtension];
 	[server setName:fileName];
 	NSString			*bjName = [NSString stringWithFormat:@"%@ OSCQuery Helper",fileName];
-	int					nameLength = [bjName length];
+	int					nameLength = (int)[bjName length];
 	if (nameLength > 63)	{
 		bjName = [NSString stringWithFormat:@"%@...%@",[bjName substringWithRange:NSMakeRange(0,30)],[bjName substringWithRange:NSMakeRange(nameLength-30,30)]];
 	}
@@ -304,7 +304,7 @@ - (void) _loadAbletonProjectFile:(NSString *)fullPath	{
 		NSString		*objDesc = [baseObj objectForKey:kVVOSCQ_ReqAttr_Desc];
 		NSArray			*objTags = [baseObj objectForKey:kVVOSCQ_OptAttr_Tags];
 		NSArray			*objExtType = [baseObj objectForKey:kVVOSCQ_OptAttr_Ext_Type];	//	one for each type from the type tag string
-		NSNumber		*objAccess = [baseObj objectForKey:kVVOSCQ_OptAttr_Access];
+		//NSNumber		*objAccess = [baseObj objectForKey:kVVOSCQ_OptAttr_Access];
 		NSArray			*objRange = [baseObj objectForKey:kVVOSCQ_OptAttr_Range];	//	one for each type from the type tag string
 		NSArray			*objUnits = [baseObj objectForKey:kVVOSCQ_OptAttr_Unit];	//	one for each type from the type tag string
 		NSNumber		*objCritical = [baseObj objectForKey:kVVOSCQ_OptAttr_Critical];

MIDIOSCQueryHelper/MIDIOSCQueryHelperAppDelegate.m

@@ -198,7 +198,6 @@ - (void) _loadLastFile	{
 	NSString			*tmpString = [def objectForKey:@"lastOpenDocumentFile"];
 	//	if there's no default, try to find the sample document we include and use that
 	if (tmpString == nil)	{
-		NSFileManager		*fm = [NSFileManager defaultManager];
 		NSString			*samplePath = [@"~/Documents/MIDI OSCQuery Helper/SampleDocument.json" stringByExpandingTildeInPath];
 		if ([[NSFileManager defaultManager] fileExistsAtPath:samplePath])
 			tmpString = samplePath;
@@ -258,7 +257,7 @@ - (void) _loadJSONFile:(NSString *)fullPath	{
 	NSString			*fileName = [[fullPath lastPathComponent] stringByDeletingPathExtension];
 	[server setName:fileName];
 	NSString			*bjName = [NSString stringWithFormat:@"%@ OSCQuery Helper",fileName];
-	int					nameLength = [bjName length];
+	int					nameLength = (int)[bjName length];
 	if (nameLength > 63)	{
 		bjName = [NSString stringWithFormat:@"%@...%@",[bjName substringWithRange:NSMakeRange(0,30)],[bjName substringWithRange:NSMakeRange(nameLength-30,30)]];
 	}

OSCQueryHelper/OSCQueryHelperAppDelegate.m

@@ -200,7 +200,6 @@ - (void) _loadLastFile	{
 	NSString			*tmpString = [def objectForKey:@"lastOpenDocumentFile"];
 	//	if there's no default, try to find the sample document we include and use that
 	if (tmpString == nil)	{
-		NSFileManager		*fm = [NSFileManager defaultManager];
 		NSString			*samplePath = [@"~/Documents/OSCQuery Helper/SampleDocument.json" stringByExpandingTildeInPath];
 		if ([[NSFileManager defaultManager] fileExistsAtPath:samplePath])
 			tmpString = samplePath;
@@ -261,7 +260,7 @@ - (void) _loadJSONFile:(NSString *)fullPath	{
 	NSString			*fileName = [[fullPath lastPathComponent] stringByDeletingPathExtension];
 	[server setName:fileName];
 	NSString			*bjName = [NSString stringWithFormat:@"%@ OSCQuery Helper",fileName];
-	int					nameLength = [bjName length];
+	int					nameLength = (int)[bjName length];
 	if (nameLength > 63)	{
 		bjName = [NSString stringWithFormat:@"%@...%@",[bjName substringWithRange:NSMakeRange(0,30)],[bjName substringWithRange:NSMakeRange(nameLength-30,30)]];
 	}

VVOSCQueryBrowser/RemoteNode.m

@@ -450,6 +450,19 @@ - (id) initWithParent:(RemoteNode *)p dict:(NSDictionary *)d	{
 				[contents addObject:newNode];
 			}
 		}];
+		[contents sortUsingComparator:(NSComparator)^(id obj1, id obj2)	{
+			NSString		*str1 = nil;
+			NSString		*str2 = nil;
+			if ([obj1 isKindOfClass:[RemoteNode class]])
+				str1 = [obj1 name];
+			else
+				str1 = [NSString stringWithFormat:@"%@-%d",[[obj1 parentNode] name],[(RemoteNodeControl*)obj1 index]];
+			if ([obj2 isKindOfClass:[RemoteNode class]])
+				str2 = [obj2 name];
+			else
+				str2 = [NSString stringWithFormat:@"%@-%d",[[obj2 parentNode] name],[(RemoteNodeControl*)obj2 index]];
+			return [str1 caseInsensitiveCompare:str2];
+		}];
 	}
 	return self;
 }

VVOSCQueryBrowser/RemoteNodeControl.h

@@ -62,6 +62,7 @@ case 'I':
 
 @property (weak) RemoteNode * parentNode;
 //@property (assign) int index;
+@property (readonly) int index;
 @property (strong) NSString * typeString;
 @property (strong) OSCValue * value;
 @property (strong) OSCValue * min;

VVOSCQueryBrowser/RemoteNodeControl.m

@@ -81,6 +81,9 @@ - (NSString *) outlineViewIdentifier	{
 
 
 @synthesize parentNode;
+- (int) index	{
+	return (parentNode==nil) ? 0 : (int)[parentNode indexOfControl:self];
+}
 @synthesize typeString;
 @synthesize value;
 @synthesize min;

VVOSCQueryBrowser/ServerUIController.m

@@ -112,11 +112,11 @@ - (void) newServerChosen:(VVOSCQueryRemoteServer*)n	{
 		return;
 
 	//	resign as delegate from my existing server
-	[server setDelegate:nil];
+	[server removeDelegate:self];
 
 	//	update my server, sign up as its delegate
 	server = n;
-	[server setDelegate:self];
+	[server addDelegate:self];
 
 	//	do a full reload (reload the expand states too)
 	[self fullReloadData];
@@ -170,7 +170,7 @@ - (void) remoteServerWentOffline:(VVOSCQueryRemoteServer *)remoteServer	{
 }
 - (void) remoteServer:(VVOSCQueryRemoteServer *)remoteServer websocketDeliveredJSONObject:(NSDictionary *)jsonObj	{
 	NSLog(@"%s ... %@",__func__,jsonObj);
-	NSLog(@"\t\tshould be checking for and handling PATH_CHANGED here, %s",__func__);
+	//NSLog(@"\t\tshould be checking for and handling PATH_CHANGED here, %s",__func__);
 }
 - (void) remoteServer:(VVOSCQueryRemoteServer *)remoteServer receivedOSCPacket:(const void *)packet sized:(size_t)packetSize	{
 	//NSLog(@"%s ... %p, %ld",__func__,packet,packetSize);
@@ -439,6 +439,7 @@ - (void) fullReloadData	{
 	}
 	[self reloadRemoteNodes];
 	[uiItemOutlineView reloadData];
+	[uiItemOutlineView expandItem:nil expandChildren:YES];
 }
 
 

VVOSCQueryClient/OSCQueryProtocolClientAppDelegate.m

@@ -74,7 +74,7 @@ - (void) coalescingTimerCallback:(NSTimer *)t	{
 	[displayString appendFormat:@"%d servers detected:\n",(servers==nil) ? 0 : (int)[servers count]];
 	[displayString appendFormat:@"**************\n"];
 	for (VVOSCQueryRemoteServer *server in servers)	{
-		[server setDelegate:self];
+		[server addDelegate:self];
 		[displayString appendFormat:@"name: \"%@\"\n",[server oscName]];
 		[displayString appendFormat:@"\tbonjour: \"%@\"\n",[server bonjourName]];
 		[displayString appendFormat:@"\taddress: %@:%d\n",[server webServerAddressString],[server webServerPort]];

VVOSCQueryProtocol.xcodeproj/project.pbxproj

@@ -27,6 +27,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		1A0B5F55203E0EC800948FDA /* ZWRObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0B5F53203E0EC800948FDA /* ZWRObject.m */; };
+		1A0B5F56203E0EC800948FDA /* ZWRObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0B5F54203E0EC800948FDA /* ZWRObject.h */; };
 		1A0E2F361FD6D3CB00F0855D /* VVOSCQueryBrowserAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0E2F351FD6D3CB00F0855D /* VVOSCQueryBrowserAppDelegate.m */; };
 		1A0E2F381FD6D3CB00F0855D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1A0E2F371FD6D3CB00F0855D /* Assets.xcassets */; };
 		1A0E2F3B1FD6D3CB00F0855D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A0E2F391FD6D3CB00F0855D /* MainMenu.xib */; };
@@ -347,6 +349,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1A0B5F53203E0EC800948FDA /* ZWRObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZWRObject.m; sourceTree = "<group>"; };
+		1A0B5F54203E0EC800948FDA /* ZWRObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZWRObject.h; sourceTree = "<group>"; };
 		1A0E2F321FD6D3CB00F0855D /* OSCQuery Browser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OSCQuery Browser.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1A0E2F341FD6D3CB00F0855D /* VVOSCQueryBrowserAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VVOSCQueryBrowserAppDelegate.h; sourceTree = "<group>"; };
 		1A0E2F351FD6D3CB00F0855D /* VVOSCQueryBrowserAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VVOSCQueryBrowserAppDelegate.m; sourceTree = "<group>"; };
@@ -764,6 +768,8 @@
 		1AF1087C1FCDD7F3004566A8 /* internal */ = {
 			isa = PBXGroup;
 			children = (
+				1A0B5F54203E0EC800948FDA /* ZWRObject.h */,
+				1A0B5F53203E0EC800948FDA /* ZWRObject.m */,
 				1A906E7E1FCC8D1700F0E412 /* NSNetServiceAdditions.h */,
 				1A906E7F1FCC8D1700F0E412 /* NSNetServiceAdditions.m */,
 				1AF108781FCDC509004566A8 /* NSStringAdditions.h */,
@@ -803,6 +809,7 @@
 				1AF108761FCD9DC0004566A8 /* CURLDL.h in Headers */,
 				1A906E801FCC8D1700F0E412 /* NSNetServiceAdditions.h in Headers */,
 				1A336E941FC871900007877C /* VVOSCQueryRemoteServer.h in Headers */,
+				1A0B5F56203E0EC800948FDA /* ZWRObject.h in Headers */,
 				1AB89C311FD1EE1B0094A66B /* WSPPServer.hpp in Headers */,
 				1AB4FB2C1FCC6C91005E3028 /* VVOSCQueryServerDetectorDomain.h in Headers */,
 				1A480FE51FCAD55D00F86354 /* VVOSCQueryServerDetector.h in Headers */,
@@ -1152,6 +1159,7 @@
 				1AB89C301FD1EE1B0094A66B /* WSPPServer.cpp in Sources */,
 				1A480FDE1FC89A9D00F86354 /* VVOSCQueryReply.m in Sources */,
 				1AF108771FCD9DC0004566A8 /* CURLDL.m in Sources */,
+				1A0B5F55203E0EC800948FDA /* ZWRObject.m in Sources */,
 				1A7C48F61FD586DB00AE4287 /* VVOSCQueryStringUtilities.cpp in Sources */,
 				1A336E911FC871870007877C /* VVOSCQueryServer.mm in Sources */,
 				1A336E951FC871900007877C /* VVOSCQueryRemoteServer.mm in Sources */,

VVOSCQueryProtocol/VVOSCQueryRemoteServer.h

@@ -55,11 +55,7 @@
 	NSString		*wsServerAddressString;
 	int				wsServerPort;
 
-#if __has_feature(objc_arc)
-	__weak id<VVOSCQueryRemoteServerDelegate>		delegate;
-#else
-	id<VVOSCQueryRemoteServerDelegate>		delegate;
-#endif
+	NSMutableArray		*delegateRefs;	//	array of ZWRObject instances, each instance is a zeroing weak ref to a delegate
 }
 
 //	you should try to avoid retaining any of these remote servers- use a weak ref if you want to store a ptr to one of them.
@@ -87,12 +83,10 @@
 @property (readonly) NSString *wsServerAddressString;
 @property (readonly) int wsServerPort;
 
-//	the delegate is notified if the remote server goes offline.  the delegate is also notified if the server delivers a JSON blob over the websocket connection.
-#if __has_feature(objc_arc)
-@property (weak) id<VVOSCQueryRemoteServerDelegate> delegate;
-#else
-@property (assign) id<VVOSCQueryRemoteServerDelegate> delegate;
-#endif
+//	delegates are informed of a variety of server events, including path add/remove/change callbacks, OSC packets delivered over the websocket connection, other miscellaneous websocket data, and offline callbacks
+- (void) addDelegate:(id<VVOSCQueryRemoteServerDelegate>)n;
+- (void) removeDelegate:(id<VVOSCQueryRemoteServerDelegate>)n;
+- (NSArray *) delegateRefs;
 
 //	synchronous- queries the remote server for its host info
 - (NSDictionary *) hostInfo;