X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/92cf4bdca5f1a76e6feec10a0d9ea32b51f286e8..6e637324a7d146b5675fec00c819259d7ac9c244:/MainController.m diff --git a/MainController.m b/MainController.m index f47c01b..aaddc7f 100755 --- a/MainController.m +++ b/MainController.m @@ -2,6 +2,7 @@ #import "MenuController.h" #import "PreferencesController.h" #import "NetworkController.h" +#import "NetworkObject.h" #import #import #import @@ -61,8 +62,10 @@ static MainController *sharedController; networkController = [[NetworkController alloc] init]; if ([df boolForKey:@"enableSharing"]) { [self setServerStatus:YES]; - } else if ([df boolForKey:@"useSharedPlayer"] && [df boolForKey:@"alwaysUseSharedPlayer"]) { - [self connectToServer]; + } else if ([df boolForKey:@"useSharedPlayer"]) { + if (![self connectToServer]) { + [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES]; + } } //Setup for notification of the remote player launching or quitting @@ -942,12 +945,16 @@ static MainController *sharedController; - (BOOL)connectToServer { + ITDebugLog(@"Attempting to connect to shared remote."); //Connect if ([networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]]) { - currentRemote = [networkController sharedRemote]; - [refreshTimer invalidate]; + currentRemote = [[[networkController networkObject] remote] retain]; + [self timerUpdate]; + //[refreshTimer invalidate]; + ITDebugLog(@"Connection successful."); return YES; } else { + ITDebugLog(@"Connection failed."); currentRemote = [remoteArray objectAtIndex:0]; return NO; } @@ -955,21 +962,55 @@ static MainController *sharedController; - (BOOL)disconnectFromServer { + ITDebugLog(@"Disconnecting from shared remote."); //Disconnect + [currentRemote release]; currentRemote = [remoteArray objectAtIndex:0]; [networkController disconnect]; [self timerUpdate]; return YES; } +- (void)checkForRemoteServer:(NSTimer *)timer +{ + ITDebugLog(@"Checking for remote server."); + if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) { + ITDebugLog(@"Remote server found."); + [timer invalidate]; + [[StatusWindowController sharedController] showReconnectQueryWindow]; + } else { + ITDebugLog(@"Remote server not found."); + } +} + - (void)networkError:(NSException *)exception { ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]); - NSRunAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil); - if ([networkController isConnectedToServer] && [self disconnectFromServer]) { - } else { - ITDebugLog(@"CRITICAL ERROR DISCONNECTING!"); + if ([[exception name] isEqualToString:NSPortTimeoutException]) { + NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil); + if ([networkController isConnectedToServer] && [self disconnectFromServer]) { + [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES]; + } else { + ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!"); + } + } +} + +- (void)reconnect +{ + if (![self connectToServer]) { + [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES]; } + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; +} + +- (void)cancelReconnect +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; } /*************************************************************************/