Merge branch 'master' of git://github.com/ksuther/MenuTunes
[MenuTunes.git] / MainController.m
index 011f73e..7496d23 100755 (executable)
@@ -6,10 +6,40 @@
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
+#import <ITKit/ITCategory-NSMenu.h>
 #import "StatusWindow.h"
 #import "StatusWindowController.h"
+#import "AudioscrobblerController.h"
 #import "StatusItemHack.h"
 
+@interface NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
+@interface NSCarbonMenuImpl:NSObject
+{
+    NSMenu *_menu;
+}
+
++ (void)initialize;
++ (void)setupForNoMenuBar;
+- (void)dealloc;
+- (void)setMenu:fp8;
+- menu;
+- (void)itemChanged:fp8;
+- (void)itemAdded:fp8;
+- (void)itemRemoved:fp8;
+- (void)performActionWithHighlightingForItemAtIndex:(int)fp8;
+- (void)performMenuAction:(SEL)fp8 withTarget:fp12;
+- (void)setupCarbonMenuBar;
+- (void)setAsMainCarbonMenuBar;
+- (void)clearAsMainCarbonMenuBar;
+- (void)popUpMenu:fp8 atLocation:(NSPoint)fp12 width:(float)fp20 forView:fp24 withSelectedItem:(int)fp28 withFont:fp32;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16 withFont:fp20;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16;
+- window;
+@end
+
 @implementation NSImage (SmoothAdditions)
 
 - (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize
@@ -35,6 +65,8 @@
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
+
+- (void)invalidateStatusWindowUpdateTimer;
 @end
 
 static MainController *sharedController;
@@ -56,24 +88,47 @@ static MainController *sharedController;
     if ( ( self = [super init] ) ) {
         sharedController = self;
         
+               _statusWindowUpdateTimer = nil;
+               _audioscrobblerTimer = nil;
+               
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         [[PreferencesController sharedPrefs] setController:self];
         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         timerUpdating = NO;
-        blinged = NO;
     }
     return self;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+       NSString *iTunesPath = [df stringForKey:@"CustomPlayerPath"];
+       NSDictionary *iTunesInfoPlist;
+       float iTunesVersion;
+       
     //Turn on debug mode if needed
-    if ([df boolForKey:@"ITDebugMode"]) {
+       /*if ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)
+    if ((GetCurrentKeyModifiers() & (optionKey | rightOptionKey)) != 0)
+    if ((GetCurrentKeyModifiers() & (shiftKey | rightShiftKey)) != 0)*/
+    if ([df boolForKey:@"ITDebugMode"] || ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)) {
         SetITDebugMode(YES);
+               [[StatusWindowController sharedController] showDebugModeEnabledWindow];
     }
-    
+
+       //Check if iTunes 4.7 or later is installed     
+       if (!iTunesPath) {
+               iTunesPath = [[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes.app"];
+       }
+       iTunesInfoPlist = [[NSBundle bundleWithPath:iTunesPath] infoDictionary];
+       iTunesVersion = [[iTunesInfoPlist objectForKey:@"CFBundleVersion"] floatValue];
+       ITDebugLog(@"iTunes version found: %f.", iTunesVersion);
+       if (iTunesVersion >= 4.7) {
+               _needsPolling = NO;
+       } else {
+               _needsPolling = YES;
+       }
+       
     if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
         [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
         [df synchronize];
@@ -84,12 +139,14 @@ static MainController *sharedController;
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
+       [[self currentRemote] currentSongElapsed];
+       
     //Turn on network stuff if needed
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {
-        [self checkForRemoteServer];
+        [self checkForRemoteServerAndConnectImmediately:YES];
     }
     
     //Setup for notification of the remote player launching or quitting
@@ -118,14 +175,6 @@ static MainController *sharedController;
                 withLength:NSSquareStatusItemLength];
     }
     
-    bling = [[MTBlingController alloc] init];
-    [self blingTime];
-    registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0
-                             target:self
-                             selector:@selector(blingTime)
-                             userInfo:nil
-                             repeats:YES] retain];
-    
     NS_DURING
         if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
             [self applicationLaunched:nil];
@@ -142,8 +191,20 @@ static MainController *sharedController;
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 
+       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+               if ([PreferencesController getKeychainItemPasswordForUser:[df stringForKey:@"audioscrobblerUser"]] != nil) {
+                       [[AudioscrobblerController sharedController] attemptHandshake:NO];
+               }
+       }
+
     [networkController startRemoteServerSearch];
     [NSApp deactivate];
+       [self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];
+}
+
+- (void)rawr
+{
+       _open = YES;
 }
 
 - (ITMTRemote *)loadRemote
@@ -200,90 +261,6 @@ static MainController *sharedController;
     [pool release];
 }*/
 
-- (void)setBlingTime:(NSDate*)date
-{
-    NSMutableDictionary *globalPrefs;
-    [df synchronize];
-    globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
-    if (date) {
-        [globalPrefs setObject:date forKey:@"ITMTTrialStart"];
-        [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];
-    } else {
-        [globalPrefs removeObjectForKey:@"ITMTTrialStart"];
-        [globalPrefs removeObjectForKey:@"ITMTTrialVers"];
-    }
-    [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
-    [df synchronize];
-    [globalPrefs release];
-}
-
-- (NSDate*)getBlingTime
-{
-    [df synchronize];
-    return [[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialStart"];
-}
-
-- (void)blingTime
-{
-    NSDate *now = [NSDate date];
-    if (![self blingBling]) {
-        if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
-            [self setBlingTime:now];
-        } else if ([[[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialVers"] intValue] < MT_CURRENT_VERSION) {
-            if ([now timeIntervalSinceDate:[self getBlingTime]] >= 345600) {
-                [self setBlingTime:[now addTimeInterval:-259200]];
-            } else {
-                NSMutableDictionary *globalPrefs;
-                [df synchronize];
-                globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
-                [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];
-                [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
-                [df synchronize];
-                [globalPrefs release];
-            }
-        }
-        
-        if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) && (blinged != YES) ) {
-            blinged = YES;
-            [statusItem setEnabled:NO];
-            [self clearHotKeys];
-            if ([refreshTimer isValid]) {
-                [refreshTimer invalidate];
-            }
-            [statusWindowController showRegistrationQueryWindow];
-        }
-    } else {
-        if (blinged) {
-            [statusItem setEnabled:YES];
-            [self setupHotKeys];
-            if (![refreshTimer isValid]) {
-                [refreshTimer release];
-                refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-                             target:self
-                             selector:@selector(timerUpdate)
-                             userInfo:nil
-                             repeats:YES] retain];
-            }
-            blinged = NO;
-        }
-        [self setBlingTime:nil];
-    }
-}
-
-- (void)blingNow
-{
-    [bling showPanel];
-}
-
-- (BOOL)blingBling
-{
-    if ( ! ([bling checkDone] == 2475) ) {
-        return NO;
-    } else {
-        return YES;
-    }
-}
-
 - (BOOL)songIsPlaying
 {
     NSString *identifier = nil;
@@ -297,7 +274,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
-    ITMTRemotePlayerPlaylistClass class = nil;
+    ITMTRemotePlayerPlaylistClass class = ITMTRemotePlayerLibraryPlaylist;
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
@@ -332,9 +309,26 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
-        ITDebugLog(@"The song changed.");
-        
+       NSString *identifier = nil;
+       NS_DURING
+               identifier = [[self currentRemote] playerStateUniqueIdentifier];
+       NS_HANDLER
+               [self networkError:localException];
+       NS_ENDHANDLER
+       if (refreshTimer && identifier == nil) {
+               if ([statusItem isEnabled]) {
+                       [statusItem setToolTip:@"iTunes not responding."];
+               }
+               [statusItem setEnabled:NO];
+               return;
+       } else if (![statusItem isEnabled]) {
+               [statusItem setEnabled:YES];
+               [statusItem setToolTip:_toolTip];
+               return;
+       }
+       
+       if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
+        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];
@@ -353,42 +347,52 @@ 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];
-                NSString *toolTip;
-                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:identifier];
+                               //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 = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
+                                       }
+                                       [statusItem setToolTip:_toolTip];
+                               } else {
+                                       [statusItem setToolTip:nil];
+                               }
+                       }
+                       
+                       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+                               int length = [[self currentRemote] currentSongDuration];
+                               if (length > 30) {
+                                       _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+                                       [_audioscrobblerTimer invalidate];
+                                       [_audioscrobblerTimer release];
+                                       _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+                                       [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+                               }
+                       } else {
+                               _audioscrobblerTimer = 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]];
     }
@@ -397,6 +401,25 @@ static MainController *sharedController;
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
+       
+       if (([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning) {
+               if (refreshTimer) {
+                       if ([statusItem isEnabled]) {
+                               [statusItem setToolTip:NSLocalizedString(@"iTunesNotResponding", @"iTunes is not responding.")];
+                       }
+                       [statusItem setEnabled:NO];
+               } else {
+                       NSMenu *menu = [[NSMenu alloc] init];
+                       [menu addItemWithTitle:NSLocalizedString(@"iTunesNotResponding", @"iTunes is not responding.") action:nil keyEquivalent:@""];
+                       [statusItem setMenu:[menu autorelease]];
+               }
+               return;
+       } else if (![statusItem isEnabled]) {
+               [statusItem setEnabled:YES];
+               [statusItem setToolTip:_toolTip];
+               return;
+       }
+       
     if ([networkController isConnectedToServer]) {
         //Used the cached version
         return;
@@ -413,6 +436,123 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)trackChanged:(NSNotification *)note
+{
+       //If we're running the timer, shut it off since we don't need it!
+       /*if (refreshTimer && [refreshTimer isValid]) {
+               ITDebugLog(@"Invalidating refresh timer.");
+               [refreshTimer invalidate];
+               [refreshTimer release];
+               refreshTimer = nil;
+       }*/
+       
+       if (![self songChanged]) {
+               return;
+       }
+       NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+       if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+               [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+       }
+       [_lastTrackInfo release];
+       _lastTrackInfo = [[note userInfo] retain];
+       
+       [self setLatestSongIdentifier:identifier];
+       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];
+               NSString *nextScript;
+               ITDebugLog(@"Running AppleScripts for song change.");
+               while ( (nextScript = [scriptsEnum nextObject]) ) {
+                       NSDictionary *error;
+                       NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
+                       ITDebugLog(@"Running script: %@", nextScript);
+                       if (!currentScript || ![currentScript executeAndReturnError:nil]) {
+                               ITDebugLog(@"Error running script %@.", nextScript);
+                       }
+                       [currentScript release];
+               }
+       }
+       
+       [statusItem setEnabled:NO];
+       
+       NS_DURING
+               latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
+               
+               if ([menuController rebuildSubmenus]) {
+                       /*if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+                               [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+                       }*/
+                       [self setLatestSongIdentifier:identifier];
+                       //Create the tooltip for the status item
+                       if ( [df boolForKey:@"showToolTip"] ) {
+                               ITDebugLog(@"Creating status item tooltip.");
+                               NSString *artist = [_lastTrackInfo objectForKey:@"Artist"], *title = [_lastTrackInfo objectForKey:@"Name"];
+                               if (artist) {
+                                       _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+                               } else if (title) {
+                                       _toolTip = title;
+                               } else {
+                                       _toolTip = NSLocalizedString(@"noSongPlaying", @"No song is playing.");;
+                               }
+                               [statusItem setToolTip:_toolTip];
+                       } else {
+                               [statusItem setToolTip:nil];
+                       }
+               }
+               
+               if ([df boolForKey:@"audioscrobblerEnabled"]) {
+                       int length = [[self currentRemote] currentSongDuration];
+                       if (length > 30) {
+                               _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+                               [_audioscrobblerTimer invalidate];
+                               [_audioscrobblerTimer release];
+                               _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+                               [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+                       }
+               } else {
+                       _audioscrobblerTimer = 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]];
+    }
+}
+
+- (void)submitAudioscrobblerTrack:(NSTimer *)timer
+{
+       ITDebugLog(@"Audioscrobbler: Attempting to submit current track");
+       [timer invalidate];
+       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+               NS_DURING
+                       int elapsed = [[self currentRemote] currentSongPlayed], length = [[self currentRemote] currentSongDuration], requiredInterval = ((length / 2 < 240) ? length / 2 : 240);
+                       if ((abs(elapsed - requiredInterval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
+                               NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+                               if (title && artist) {
+                                       ITDebugLog(@"Audioscrobbler: Submitting current track");
+                                       [[AudioscrobblerController sharedController] submitTrack:title
+                                                                                                                                       artist:artist
+                                                                                                                                       album:[[self currentRemote] currentSongAlbum]
+                                                                                                                                       length:[[self currentRemote] currentSongDuration]];
+                               }
+                       } else if (requiredInterval - elapsed > 0) {
+                               _audioscrobblerInterval = requiredInterval - elapsed;
+                               [_audioscrobblerTimer release];
+                               ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+                               _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+                               [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+                       }
+               NS_HANDLER
+                       [self networkError:localException];
+               NS_ENDHANDLER
+       }
+}
+
 //
 //
 // Menu Selectors
@@ -436,7 +576,9 @@ static MainController *sharedController;
         [self networkError:localException];
     NS_ENDHANDLER
     
-    [self timerUpdate];
+       if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)nextSong
@@ -447,7 +589,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)prevSong
@@ -458,7 +602,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)fastForward
@@ -469,7 +615,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)rewind
@@ -480,7 +628,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)selectPlaylistAtIndex:(int)index
@@ -492,7 +642,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)selectSongAtIndex:(int)index
@@ -503,7 +655,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)selectSongRating:(int)rating
@@ -514,18 +668,37 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     ITDebugLog(@"Selecting EQ preset %i", index);
     NS_DURING
-        [[self currentRemote] switchToEQAtIndex:index];
+        if (index == -1) {
+            [[self currentRemote] setEqualizerEnabled:![[self currentRemote] equalizerEnabled]];
+        } else {
+            [[self currentRemote] switchToEQAtIndex:index];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    if (refreshTimer) {
+               [self timerUpdate];
+       }
+}
+
+- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type
+{
+    ITDebugLog(@"Making playlist with term %@, type %i", term, type);
+    NS_DURING
+        [[self currentRemote] makePlaylistWithTerm:term ofType:type];
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    ITDebugLog(@"Done making playlist");
 }
 
 - (void)showPlayer
@@ -566,7 +739,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Show preferences.");
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
@@ -663,6 +836,26 @@ static MainController *sharedController;
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
+    if ([df objectForKey:@"FastForward"] != nil) {
+        ITDebugLog(@"Setting up fast forward hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"FastForward"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"FastForward"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(fastForward)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+    
+    if ([df objectForKey:@"Rewind"] != nil) {
+        ITDebugLog(@"Setting up rewind hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"Rewind"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"Rewind"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(rewind)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+    
     if ([df objectForKey:@"ShowPlayer"] != nil) {
         ITDebugLog(@"Setting up show player hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -679,10 +872,20 @@ static MainController *sharedController;
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
         [hotKey setTarget:self];
-        [hotKey setAction:@selector(showCurrentTrackInfo)];
+        [hotKey setAction:@selector(showCurrentTrackInfoHotKey)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
+       if ([df objectForKey:@"AlbumArt"] != nil) {
+        ITDebugLog(@"Setting up album art hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"AlbumArt"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"AlbumArt"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(showCurrentAlbumArtHotKey)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+       
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
         ITDebugLog(@"Setting up upcoming songs hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -752,9 +955,106 @@ static MainController *sharedController;
         [hotKey setAction:@selector(decrementRating)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
+    
+       if ([df objectForKey:@"ToggleShufflability"] != nil) {
+        ITDebugLog(@"Setting up toggle song shufflability hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"ToggleShufflability"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShufflability"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(toggleSongShufflable)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+       
+    if ([df objectForKey:@"PopupMenu"] != nil) {
+        ITDebugLog(@"Setting up popup menu hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"PopupMenu"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PopupMenu"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(popupMenu)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+    
+    int i;
+    for (i = 0; i <= 5; i++) {
+        NSString *curName = [NSString stringWithFormat:@"SetRating%i", i];
+        if ([df objectForKey:curName] != nil) {
+            ITDebugLog(@"Setting up set rating %i hot key.", i);
+            hotKey = [[ITHotKey alloc] init];
+            [hotKey setName:curName];
+            [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:curName]]];
+            [hotKey setTarget:self];
+            [hotKey setAction:@selector(setRating:)];
+            [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+        }
+    }
     ITDebugLog(@"Finished setting up hot keys.");
 }
 
+- (void)showCurrentTrackInfoHotKey
+{
+       //If we're already visible and the setting says so, vanish instead of displaying again.
+       if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+               ITDebugLog(@"Track window is already visible, hiding track window.");
+               [self invalidateStatusWindowUpdateTimer];
+               [[StatusWindow sharedWindow] vanish:nil];
+               return;
+       }
+       [self showCurrentTrackInfo];
+}
+
+- (void)showCurrentAlbumArtHotKey
+{
+       //If we're already visible and the setting says so, vanish instead of displaying again.
+       if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowAlbumArtType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+               ITDebugLog(@"Art window is already visible, hiding track window.");
+               [[StatusWindow sharedWindow] vanish:nil];
+               return;
+       }
+       [self showCurrentAlbumArt];
+}
+
+- (void)showCurrentAlbumArt
+{
+       NSImage *art = nil;
+       NS_DURING
+               art = [[self currentRemote] currentSongAlbumArt];
+       NS_HANDLER
+               [self networkError:localException];
+       NS_ENDHANDLER
+       
+       if (art) {
+               NSSize oldSize = [art size], newSize;
+               if (oldSize.width > 300 && oldSize.height > 300) {
+                       if (oldSize.width > oldSize.height) {
+                               newSize = NSMakeSize(300, oldSize.height * (300.0f / oldSize.width));
+                       } else {
+                               newSize = NSMakeSize(oldSize.width * (300.0f / oldSize.height), 300);
+                       }
+               } else {
+                       newSize = oldSize;
+               }
+               
+               art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+               
+               [statusWindowController showAlbumArtWindowWithImage:art];
+       } else {
+               NSString *string = nil;
+               NS_DURING
+                       if ([[self currentRemote] currentSongTitle]) {
+                               string = NSLocalizedString(@"noAlbumArt", @"No art for current song.");
+                       } else {
+                               string = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
+                       }
+               NS_HANDLER
+                       [self networkError:localException];
+               NS_ENDHANDLER
+               //Show the no song playing window if there is no album art or no track is playing
+               [statusWindowController showAlbumArtWindowWithErrorText:string];
+       }
+}
+
 - (void)showCurrentTrackInfo
 {
     ITMTRemotePlayerSource  source      = 0;
@@ -766,7 +1066,8 @@ static MainController *sharedController;
     NSString               *track       = nil;
     NSImage                *art         = nil;
     int                     rating      = -1;
-    
+    int                     playCount   = -1;
+       
     ITDebugLog(@"Showing track info status window.");
     
     NS_DURING
@@ -777,7 +1078,21 @@ static MainController *sharedController;
     NS_ENDHANDLER
     
     if ( title ) {
-
+        if ( [df boolForKey:@"showAlbumArtwork"] ) {
+                       NSSize oldSize, newSize;
+                       NS_DURING
+                               art = [[self currentRemote] currentSongAlbumArt];
+                               oldSize = [art size];
+                               if (oldSize.width > oldSize.height) {
+                                       newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+                               }
+                               else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+                               art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+                       NS_HANDLER
+                               [self networkError:localException];
+                       NS_ENDHANDLER
+        }
+        
         if ( [df boolForKey:@"showAlbum"] ) {
             NS_DURING
                 album = [[self currentRemote] currentSongAlbum];
@@ -805,12 +1120,15 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",
-                @"Time",
+                NSLocalizedString(@"time", @"Time"),
                 [[self currentRemote] currentSongElapsed],
                 [[self currentRemote] currentSongLength]];
             NS_HANDLER
                 [self networkError:localException];
             NS_ENDHANDLER
+                       _timeUpdateCount = 0;
+                       [self invalidateStatusWindowUpdateTimer];
+                       _statusWindowUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
@@ -844,19 +1162,13 @@ static MainController *sharedController;
             }
         }
         
-        if ( [df boolForKey:@"showAlbumArtwork"] ) {
-           NSSize oldSize, newSize;
-             NS_DURING
-                art = [[self currentRemote] currentSongAlbumArt];
-                oldSize = [art size];
-                if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
-                else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
-                art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+        if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] && [[self currentRemote] currentSource] == ITMTRemoteLibrarySource ) {
+            NS_DURING
+                playCount = [[self currentRemote] currentSongPlayCount];
             NS_HANDLER
                 [self networkError:localException];
             NS_ENDHANDLER
         }
-        
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
@@ -869,9 +1181,41 @@ static MainController *sharedController;
                                                     time:time
                                                    track:track
                                                   rating:rating
+                                               playCount:playCount
                                                    image:art];
 }
 
+- (void)updateTime:(NSTimer *)timer
+{
+       StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
+       _timeUpdateCount++;
+       if ([statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [sw visibilityState] != ITWindowHiddenState) {
+               NSString *time = nil, *length;
+               NS_DURING
+                       length = [[self currentRemote] currentSongLength];
+                       if (length) {
+                               time = [NSString stringWithFormat:@"%@: %@ / %@",
+                                                       NSLocalizedString(@"time", @"Time"),
+                                                       [[self currentRemote] currentSongElapsed],
+                                                       length];
+                               [[StatusWindowController sharedController] updateTime:time];
+                       }
+               NS_HANDLER
+                       [self networkError:localException];
+               NS_ENDHANDLER
+       } else {
+               [self invalidateStatusWindowUpdateTimer];
+       }
+}
+
+- (void)invalidateStatusWindowUpdateTimer
+{
+       if (_statusWindowUpdateTimer) {
+               [_statusWindowUpdateTimer invalidate];
+               _statusWindowUpdateTimer = nil;
+       }
+}
+
 - (void)showUpcomingSongs
 {
     int numSongs = 0;
@@ -881,6 +1225,8 @@ static MainController *sharedController;
         [self networkError:localException];
     NS_ENDHANDLER
     
+       [self invalidateStatusWindowUpdateTimer];
+       
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {
@@ -889,10 +1235,12 @@ static MainController *sharedController;
             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     
-            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
-                if (i <= numSongs) {
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance && i <= numSongs; i++) {
+                if ([[self currentRemote] songEnabledAtIndex:i]) {
                     [songList addObject:[[self currentRemote] songTitleAtIndex:i]];
-                }
+                } else {
+                                       numSongsInAdvance++;
+                               }
             }
             
             if ([songList count] == 0) {
@@ -908,6 +1256,17 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)popupMenu
+{
+    if (!_popped) {
+        _popped = YES;
+        [self menuClicked];
+        NSMenu *menu = [statusItem menu];
+        [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+        _popped = NO;
+    }
+}
+
 - (void)incrementVolume
 {
     NS_DURING
@@ -926,6 +1285,7 @@ static MainController *sharedController;
         [[self currentRemote] setVolume:volume];
     
         // Show volume status window
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showVolumeWindowWithLevel:dispVol];
     NS_HANDLER
         [self networkError:localException];
@@ -950,6 +1310,7 @@ static MainController *sharedController;
         [[self currentRemote] setVolume:volume];
         
         //Show volume status window
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showVolumeWindowWithLevel:dispVol];
     NS_HANDLER
         [self networkError:localException];
@@ -975,6 +1336,7 @@ static MainController *sharedController;
         [[self currentRemote] setCurrentSongRating:rating];
         
         //Show rating status window
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showRatingWindowWithRating:rating];
     NS_HANDLER
         [self networkError:localException];
@@ -1000,12 +1362,22 @@ static MainController *sharedController;
         [[self currentRemote] setCurrentSongRating:rating];
         
         //Show rating status window
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showRatingWindowWithRating:rating];
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
 }
 
+- (void)setRating:(ITHotKey *)sender
+{
+       if ([self songIsPlaying]) {
+               int stars = [[sender name] characterAtIndex:9] - 48;
+               [self selectSongRating:stars * 20];
+               [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+       }
+}
+
 - (void)toggleLoop
 {
     NS_DURING
@@ -1026,6 +1398,7 @@ static MainController *sharedController;
         [[self currentRemote] setRepeatMode:repeatMode];
         
         //Show loop status window
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showRepeatWindowWithMode:repeatMode];
     NS_HANDLER
         [self networkError:localException];
@@ -1040,28 +1413,27 @@ static MainController *sharedController;
         [[self currentRemote] setShuffleEnabled:newShuffleEnabled];
         //Show shuffle status window
         ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+               [self invalidateStatusWindowUpdateTimer];
         [statusWindowController showShuffleWindow:newShuffleEnabled];
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
 }
 
-- (void)registerNowOK
+- (void)toggleSongShufflable
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
-    [[StatusWindow sharedWindow] vanish:self];
-    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
-
-    [self blingNow];
-}
-
-- (void)registerNowCancel
-{
-    [[StatusWindow sharedWindow] setLocked:NO];
-    [[StatusWindow sharedWindow] vanish:self];
-    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
-
-    [NSApp terminate:self];
+       if ([self songIsPlaying]) {
+               NS_DURING
+                       BOOL flag = ![[self currentRemote] currentSongShufflable];
+                       ITDebugLog(@"Toggling shufflability.");
+                       [[self currentRemote] setCurrentSongShufflable:flag];
+                       //Show song shufflability status window
+                       [self invalidateStatusWindowUpdateTimer];
+                       [statusWindowController showSongShufflabilityWindow:flag];
+               NS_HANDLER
+                       [self networkError:localException];
+               NS_ENDHANDLER
+       }
 }
 
 /*************************************************************************/
@@ -1093,13 +1465,18 @@ static MainController *sharedController;
         [self setupHotKeys];
         //playerRunningState = ITMTRemotePlayerRunning;
         playerRunningState = [[self currentRemote] playerRunningState];
-        
-        [refreshTimer invalidate];
-        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-                                target:self
-                                selector:@selector(timerUpdate)
-                                userInfo:nil
-                                repeats:YES] retain];
+               if (_needsPolling) {
+                       if (refreshTimer) {
+                               [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;
@@ -1124,18 +1501,35 @@ static MainController *sharedController;
     [networkController disconnect];
     
     if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+               refreshTimer = nil;
         [self applicationLaunched:nil];
     } else {
         [self applicationTerminated:nil];
     }
-    [self timerUpdate];
+       
+    if (refreshTimer) {
+               [self timerUpdate];
+       };
     return YES;
 }
 
 - (void)checkForRemoteServer
+{
+    [self checkForRemoteServerAndConnectImmediately:NO];
+}
+
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately
 {
     ITDebugLog(@"Checking for remote server.");
-    [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:nil];
+    if (!_checkingForServer) {
+        if (!_serverCheckLock) {
+            _serverCheckLock = [[NSLock alloc] init];
+        }
+        [_serverCheckLock lock];
+        _checkingForServer = YES;
+        [_serverCheckLock unlock];
+        [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:[NSNumber numberWithBool:connectImmediately]];
+    }
 }
 
 - (void)runRemoteServerCheck:(id)sender
@@ -1144,34 +1538,46 @@ static MainController *sharedController;
     ITDebugLog(@"Remote server check running.");
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
-        [self performSelectorOnMainThread:@selector(remoteServerFound:) withObject:nil waitUntilDone:NO];
+        if ([sender boolValue]) {
+            [self performSelectorOnMainThread:@selector(connectToServer) withObject:nil waitUntilDone:NO];
+        } else {
+            [self performSelectorOnMainThread:@selector(remoteServerFound:) withObject:nil waitUntilDone:NO];
+        }
     } else {
         ITDebugLog(@"Remote server not found.");
         [self performSelectorOnMainThread:@selector(remoteServerNotFound:) withObject:nil waitUntilDone:NO];
     }
+    [_serverCheckLock lock];
+    _checkingForServer = NO;
+    [_serverCheckLock unlock];
     [pool release];
 }
 
 - (void)remoteServerFound:(id)sender
 {
     if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+               [self invalidateStatusWindowUpdateTimer];
         [[StatusWindowController sharedController] showReconnectQueryWindow];
     }
 }
 
 - (void)remoteServerNotFound:(id)sender
 {
-    [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+    if (![[NetworkController sharedController] isConnectedToServer]) {
+        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+    }
 }
 
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
     if ( ((exception == nil) || [[exception name] isEqualToString:NSPortTimeoutException]) && [networkController isConnectedToServer]) {
-        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);
+        //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);
+               [self invalidateStatusWindowUpdateTimer];
+        [[StatusWindowController sharedController] showNetworkErrorQueryWindow];
         if ([self disconnectFromServer]) {
             [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
-            [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:YES];
+            [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
         }
@@ -1180,17 +1586,18 @@ static MainController *sharedController;
 
 - (void)reconnect
 {
-    if ([self connectToServer] == 0) {
-        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:YES];
-    }
-    [[StatusWindow sharedWindow] setLocked:NO];
+    /*if ([self connectToServer] == 0) {
+        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+    }*/
+    [self checkForRemoteServerAndConnectImmediately:YES];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 - (void)cancelReconnect
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
@@ -1209,12 +1616,17 @@ static MainController *sharedController;
             [[self currentRemote] begin];
             [self setLatestSongIdentifier:@""];
             [self timerUpdate];
-            refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-                                target:self
-                                selector:@selector(timerUpdate)
-                                userInfo:nil
-                                repeats:YES] retain];
+                       if (_needsPolling) {
+                               refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+                                                                       target:self
+                                                                       selector:@selector(timerUpdate)
+                                                                       userInfo:nil
+                                                                       repeats:YES] retain];
+                       }
             //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+                       if (![df boolForKey:@"UsePollingOnly"]) {
+                               [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(trackChanged:) name:@"ITMTTrackChanged" object:nil];
+                       }
             [self setupHotKeys];
         }
     NS_HANDLER
@@ -1232,8 +1644,12 @@ static MainController *sharedController;
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
+                       [[NSNotificationCenter defaultCenter] removeObserver:self name:@"ITMTTrackChanged" object:nil];
+                       [statusItem setEnabled:YES];
+                       [statusItem setToolTip:@"iTunes not running."];
             [self clearHotKeys];
-            
+
+                       
             if ([df objectForKey:@"ShowPlayer"] != nil) {
                 ITHotKey *hotKey;
                 ITDebugLog(@"Setting up show player hot key.");
@@ -1258,11 +1674,19 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
+       [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
     [networkController stopRemoteServerSearch];
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 
+- (void)applicationDidBecomeActive:(NSNotification *)note
+{
+       //This appears to not work in 10.4
+       if (_open && ![[ITAboutWindowController sharedController] isVisible] && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
+               [[MainController sharedController] showPreferences];
+       }
+}
 
 /*************************************************************************/
 #pragma mark -
@@ -1272,11 +1696,11 @@ static MainController *sharedController;
 - (void)dealloc
 {
     [self applicationTerminated:nil];
-    [bling release];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
     [networkController release];
+    [_serverCheckLock release];
     [super dealloc];
 }