Lots of code to keep MT from being bad when iTunes locks. Fixed leak in

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 157b97a..0c19559 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -11,6 +11,10 @@
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
+@interface NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
 @interface NSCarbonMenuImpl:NSObject
 {
     NSMenu *_menu;
@@ -360,19 +364,19 @@ static MainController *sharedController;
        if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
                if ([statusItem isEnabled]) {
                        [statusItem setToolTip:@"iTunes not responding."];
-                       [self clearHotKeys];
+                       [[ITHotKeyCenter sharedCenter] setEnabled:NO];
                }
                [statusItem setEnabled:NO];
                return;
        } else if (![statusItem isEnabled]) {
                [statusItem setEnabled:YES];
                [statusItem setToolTip:_toolTip];
-               [self setupHotKeys];
+               [[ITHotKeyCenter sharedCenter] setEnabled:YES];
                return;
        }
        
        if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
-        ITDebugLog(@"The song changed.");
+        ITDebugLog(@"The song changed. '%@'", _latestSongIdentifier);
         if ([df boolForKey:@"runScripts"]) {
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
             NSEnumerator *scriptsEnum = [scripts objectEnumerator];
@@ -391,41 +395,40 @@ static MainController *sharedController;
         
         timerUpdating = YES;
         [statusItem setEnabled:NO];
-        
+               
         NS_DURING
             latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
-            [menuController rebuildSubmenus];
-    
-            if ( [df boolForKey:@"showSongInfoOnChange"] ) {
-                [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
-            }
-            
-            [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
-            
-            //Create the tooltip for the status item
-            if ( [df boolForKey:@"showToolTip"] ) {
-                NSString *artist = [[self currentRemote] currentSongArtist];
-                NSString *title = [[self currentRemote] currentSongTitle];
-                ITDebugLog(@"Creating status item tooltip.");
-                if (artist) {
-                    _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
-                } else if (title) {
-                    _toolTip = title;
-                } else {
-                    _toolTip = @"No Song Playing";
-                }
-                [statusItem setToolTip:_toolTip];
-            } else {
-                [statusItem setToolTip:nil];
-            }
+                       
+                       if ([menuController rebuildSubmenus]) {
+                               if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+                                       [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+                               }
+                               
+                               [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
+                               //Create the tooltip for the status item
+                               if ( [df boolForKey:@"showToolTip"] ) {
+                                       NSString *artist = [[self currentRemote] currentSongArtist];
+                                       NSString *title = [[self currentRemote] currentSongTitle];
+                                       ITDebugLog(@"Creating status item tooltip.");
+                                       if (artist) {
+                                               _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+                                       } else if (title) {
+                                               _toolTip = title;
+                                       } else {
+                                               _toolTip = @"No Song Playing";
+                                       }
+                                       [statusItem setToolTip:_toolTip];
+                               } else {
+                                       [statusItem setToolTip:nil];
+                               }
+                       }
         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER
-        
         timerUpdating = NO;
         [statusItem setEnabled:YES];
     }
-    
+       
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) ? [menuController menu] : [menuController menuForNoPlayer]];
     }
@@ -434,6 +437,21 @@ static MainController *sharedController;
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
+       
+       if ( ([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning ) {
+               if ([statusItem isEnabled]) {
+                       [statusItem setToolTip:@"iTunes not responding."];
+                       [[ITHotKeyCenter sharedCenter] setEnabled:NO];
+               }
+               [statusItem setEnabled:NO];
+               return;
+       } else if (![statusItem isEnabled]) {
+               [statusItem setEnabled:YES];
+               [statusItem setToolTip:_toolTip];
+               [[ITHotKeyCenter sharedCenter] setEnabled:YES];
+               return;
+       }
+       
     if ([networkController isConnectedToServer]) {
         //Used the cached version
         return;
@@ -1215,7 +1233,7 @@ static MainController *sharedController;
         [self setupHotKeys];
         //playerRunningState = ITMTRemotePlayerRunning;
         playerRunningState = [[self currentRemote] playerRunningState];
-        
+               
         [refreshTimer invalidate];
         refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
                                 target:self
@@ -1378,6 +1396,8 @@ static MainController *sharedController;
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
+                       [statusItem setEnabled:YES];
+                       [statusItem setToolTip:@"iTunes not running."];
             [self clearHotKeys];
             
             if ([df objectForKey:@"ShowPlayer"] != nil) {