Fixed a crash when unchecking share this player. Also trying to make the

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index bffb59c..fbeae9d 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -14,7 +14,6 @@
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;

-- (void)showCurrentTrackInfo;

 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end


@@ -39,10 +38,10 @@ static MainController *sharedController;
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];

+        [[PreferencesController sharedPrefs] setController:self];

         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];

-        [[PreferencesController sharedPrefs] setController:self];

         timerUpdating = NO;
         blinged = NO;
     }
         timerUpdating = NO;
         blinged = NO;
     }


@@ -291,6 +290,9 @@ static MainController *sharedController;
 {
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:[menuController menu]];
 {
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:[menuController menu]];

+        if ([[networkController networkObject] remote] == nil) {
+            [self networkError:nil];
+        }

     }
     
     if ( [self songChanged] && (timerUpdating != YES) ) {
     }
     
     if ( [self songChanged] && (timerUpdating != YES) ) {


@@ -960,6 +962,12 @@ static MainController *sharedController;
     if (result == 1) {
         [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
         currentRemote = [[[networkController networkObject] remote] retain];
     if (result == 1) {
         [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
         currentRemote = [[[networkController networkObject] remote] retain];

+        [refreshTimer invalidate];
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+                                target:self
+                                selector:@selector(timerUpdate)
+                                userInfo:nil
+                                repeats:YES] retain];

         [self timerUpdate];
         ITDebugLog(@"Connection successful.");
         return 1;
         [self timerUpdate];
         ITDebugLog(@"Connection successful.");
         return 1;


@@ -992,7 +1000,7 @@ static MainController *sharedController;
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];

-        if (![networkController isConnectedToServer]) {
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {

             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {
             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {


@@ -1070,6 +1078,17 @@ static MainController *sharedController;
             refreshTimer = nil;
             [self clearHotKeys];
             playerRunningState = ITMTRemotePlayerNotRunning;
             refreshTimer = nil;
             [self clearHotKeys];
             playerRunningState = ITMTRemotePlayerNotRunning;

+            
+            if ([df objectForKey:@"ShowPlayer"] != nil) {
+                ITHotKey *hotKey;
+                ITDebugLog(@"Setting up show player hot key.");
+                hotKey = [[ITHotKey alloc] init];
+                [hotKey setName:@"ShowPlayer"];
+                [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
+                [hotKey setTarget:self];
+                [hotKey setAction:@selector(showPlayer)];
+                [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+            }

         }
     NS_HANDLER
         [self networkError:localException];
         }
     NS_HANDLER
         [self networkError:localException];