From dc685d1d1cffcfd6bb95dd948c30f1dc315919e0 Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Sun, 23 May 2004 22:57:04 +0000 Subject: [PATCH] More bugfixes to networking. Small fix in Preferences. Show Player app launch is no in iTunesRemote for compatibility with networking. --- MainController.m | 10 ++++----- NetworkController.m | 3 ++- PreferencesController.m | 4 +++- StatusWindowController.m | 2 +- iTunesRemote.h | 1 - iTunesRemote.m | 46 +++++++++++++++++++++++++--------------- 6 files changed, 40 insertions(+), 26 deletions(-) diff --git a/MainController.m b/MainController.m index ad6f2e1..c4fd253 100755 --- a/MainController.m +++ b/MainController.m @@ -392,7 +392,7 @@ static MainController *sharedController; } if ([networkController isConnectedToServer]) { - [statusItem setMenu:[menuController menu]]; + [statusItem setMenu:([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) ? [menuController menu] : [menuController menuForNoPlayer]]; } } @@ -533,14 +533,14 @@ static MainController *sharedController; - (void)showPlayer { ITDebugLog(@"Beginning show player."); - if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { + //if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { ITDebugLog(@"Showing player interface."); NS_DURING [[self currentRemote] showPrimaryInterface]; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - } else { + /*} else { ITDebugLog(@"Launching player."); NS_DURING NSString *path; @@ -554,7 +554,7 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - } + }*/ ITDebugLog(@"Finished show player."); } @@ -1209,7 +1209,7 @@ static MainController *sharedController; - (void)applicationTerminated:(NSNotification *)note { NS_DURING - if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) { + if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer]) { ITDebugLog(@"Remote application terminated."); playerRunningState = ITMTRemotePlayerNotRunning; [[self currentRemote] halt]; diff --git a/NetworkController.m b/NetworkController.m index ce19757..33cee8f 100755 --- a/NetworkController.m +++ b/NetworkController.m @@ -220,6 +220,7 @@ static NetworkController *sharedController; host:host]; testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain]; [testConnection setReplyTimeout:2]; + [testConnection setRequestTimeout:2]; tempProxy = (NetworkObject *)[testConnection rootProxy]; [tempProxy serverName]; valid = [tempProxy isValid]; @@ -230,7 +231,7 @@ static NetworkController *sharedController; return NO; NS_ENDHANDLER - if (!clientProxy) { + if (!tempProxy) { ITDebugLog(@"Null proxy! Couldn't connect!"); [testConnection release]; [testPort release]; diff --git a/PreferencesController.m b/PreferencesController.m index 50f7397..c2767c2 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -215,7 +215,9 @@ static PreferencesController *prefs = nil; [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"]; } else if ( [sender tag] == 1030) { [df setInteger:[sender intValue] forKey:@"SongsInAdvance"]; - [[controller menuController] rebuildSubmenus]; + if ([[controller currentRemote] playerRunningState] == ITMTRemotePlayerRunning) { + [[controller menuController] rebuildSubmenus]; + } } else if ( [sender tag] == 1040) { // This will not be executed. Song info always shows the title of the song. // [df setBool:SENDER_STATE forKey:@"showName"]; diff --git a/StatusWindowController.m b/StatusWindowController.m index fac506c..cd14b33 100755 --- a/StatusWindowController.m +++ b/StatusWindowController.m @@ -266,7 +266,7 @@ static StatusWindowController *sharedController; - (void)showReconnectQueryWindow { - NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?."; + NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?"; [_window setImage:[NSImage imageNamed:@"Setup"]]; [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]]; diff --git a/iTunesRemote.h b/iTunesRemote.h index a5832bb..fc1e3a0 100755 --- a/iTunesRemote.h +++ b/iTunesRemote.h @@ -14,7 +14,6 @@ @interface iTunesRemote : ITMTRemote { - BOOL _winClosed; ProcessSerialNumber savedPSN; } - (ProcessSerialNumber)iTunesPSN; diff --git a/iTunesRemote.m b/iTunesRemote.m index d0c2366..ae430a7 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -66,25 +66,37 @@ { ITDebugLog(@"Showing player primary interface."); - //If the window is closed - _winClosed = YES; - - //If not minimized and visible - if ( ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] == 0) && - ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] != 0) && - [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) { - //set minimized of browser window 1 to true - [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + if ([self playerRunningState] == ITMTRemotePlayerRunning) { + ITDebugLog(@"Showing player interface."); + //If not minimized and visible + if ( ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] == 0) && + ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] != 0) && + [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) { + //set minimized of browser window 1 to true + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + } else { + //set minimized of browser window 1 to false + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + } + //set visible of browser window 1 to true + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + //active iTunes + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + ITDebugLog(@"Done showing player primary interface."); + return YES; } else { - //set minimized of browser window 1 to false - [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; + NSString *path; + ITDebugLog(@"Launching player."); + if ( (path = [[NSUserDefaults standardUserDefaults] stringForKey:@"CustomPlayerPath"]) ) { + } else { + path = [self playerFullName]; + } + if (![[NSWorkspace sharedWorkspace] launchApplication:path]) { + ITDebugLog(@"Error Launching Player"); + return NO; + } + return YES; } - //set visible of browser window 1 to true - [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; - //active iTunes - [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; - ITDebugLog(@"Done showing player primary interface."); - return YES; } - (ITMTRemotePlayerRunningState)playerRunningState -- 2.20.1