git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 523936c..0c19559 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -1,17 +1,67 @@
 #import "MainController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
+#import "NetworkController.h"
+#import "NetworkObject.h"
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
+#import <ITKit/ITCategory-NSMenu.h>
+#import "StatusWindow.h"
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
 #import "StatusWindowController.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
+{
+    NSImage *newImage;
+    NSImageRep *rep = [self bestRepresentationForDevice:nil];
+    
+    newImage = [[NSImage alloc] initWithSize:scaledSize];
+    [newImage lockFocus];
+    {
+        [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
+        [[NSGraphicsContext currentContext] setShouldAntialias:YES];
+        [rep drawInRect:NSMakeRect(3, 3, scaledSize.width - 6, scaledSize.height - 6)];
+    }
+    [newImage unlockFocus];
+    return [newImage autorelease];
+}
+
+@end
+
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
-- (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)showCurrentTrackInfo;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
@@ -36,9 +86,12 @@ 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];
+        timerUpdating = NO;
+        blinged = NO;
     }
     return self;
 }
     }
     return self;
 }
@@ -50,11 +103,23 @@ static MainController *sharedController;
         SetITDebugMode(YES);
     }
     
         SetITDebugMode(YES);
     }
     
-    bling = [[MTBlingController alloc] init];
-    blingDate = nil;
+    if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
+        [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
+        [df synchronize];
+        [[PreferencesController sharedPrefs] registerDefaults];
+        [[StatusWindowController sharedController] showPreferencesUpdateWindow];
+    }
     
     currentRemote = [self loadRemote];
     
     currentRemote = [self loadRemote];
-    [currentRemote begin];
+    [[self currentRemote] begin];
+    
+    //Turn on network stuff if needed
+    networkController = [[NetworkController alloc] init];
+    if ([df boolForKey:@"enableSharing"]) {
+        [self setServerStatus:YES];
+    } else if ([df boolForKey:@"useSharedPlayer"]) {
+        [self checkForRemoteServerAndConnectImmediately:YES];
+    }
     
     //Setup for notification of the remote player launching or quitting
     [[[NSWorkspace sharedWorkspace] notificationCenter]
     
     //Setup for notification of the remote player launching or quitting
     [[[NSWorkspace sharedWorkspace] notificationCenter]
@@ -69,27 +134,44 @@ static MainController *sharedController;
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
     
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
     
-    if ( ! [df objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
+    if (![df objectForKey:@"menu"]) {  // If this is nil, defaults have never been registered.
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
-    [StatusItemHack install];
-    statusItem = [[ITStatusItem alloc]
-            initWithStatusBar:[NSStatusBar systemStatusBar]
-            withLength:NSSquareStatusItemLength];
-    
-    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
-        [self applicationLaunched:nil];
+    if ([df boolForKey:@"ITMTNoStatusItem"]) {
+        statusItem = nil;
     } else {
     } else {
-        if ([df boolForKey:@"LaunchPlayerWithMT"])
-            [self showPlayer];
-        else
-            [self applicationTerminated:nil];
+        [StatusItemHack install];
+        statusItem = [[ITStatusItem alloc]
+                initWithStatusBar:[NSStatusBar systemStatusBar]
+                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];
+        } else {
+            if ([df boolForKey:@"LaunchPlayerWithMT"])
+                [self showPlayer];
+            else
+                [self applicationTerminated:nil];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 
+    [networkController startRemoteServerSearch];
     [NSApp deactivate];
 }
 
     [NSApp deactivate];
 }
 
@@ -109,7 +191,7 @@ static MainController *sharedController;
                 Class remoteClass = [remoteBundle principalClass];
 
                 if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
                 Class remoteClass = [remoteBundle principalClass];
 
                 if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
-                    [remoteClass isKindOfClass:[NSObject class]]) {
+                    [(NSObject *)remoteClass isKindOfClass:[NSObject class]]) {
                     id remote = [remoteClass remote];
                     ITDebugLog(@"Adding remote at path %@", bundlePath);
                     [remoteArray addObject:remote];
                     id remote = [remoteClass remote];
                     ITDebugLog(@"Adding remote at path %@", bundlePath);
                     [remoteArray addObject:remote];
@@ -147,21 +229,79 @@ static MainController *sharedController;
     [pool release];
 }*/
 
     [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];
 - (void)blingTime
 {
     NSDate *now = [NSDate date];
-    if ( (! blingDate) || ([now timeIntervalSinceDate:blingDate] >= 86400) ) {
-        [bling showPanelIfNeeded];
-        [blingDate autorelease];
-        blingDate = [now retain];
+    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];
     }
 }
 
 - (void)blingNow
 {
     [bling showPanel];
-    [blingDate autorelease];
-    blingDate = [[NSDate date] retain];
 }
 
 - (BOOL)blingBling
 }
 
 - (BOOL)blingBling
@@ -175,17 +315,35 @@ static MainController *sharedController;
 
 - (BOOL)songIsPlaying
 {
 
 - (BOOL)songIsPlaying
 {
-    return ( ! ([[currentRemote playerStateUniqueIdentifier] isEqualToString:@"0-0"]) );
+    NSString *identifier = nil;
+    NS_DURING
+        identifier = [[self currentRemote] playerStateUniqueIdentifier];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    return ( ! ([identifier isEqualToString:@"0-0"]) );
 }
 
 - (BOOL)radioIsPlaying
 {
 }
 
 - (BOOL)radioIsPlaying
 {
-    return ( [currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist );
+    ITMTRemotePlayerPlaylistClass class = nil;
+    NS_DURING
+        class = [[self currentRemote] currentPlaylistClass];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    return (class  == ITMTRemotePlayerRadioPlaylist );
 }
 
 - (BOOL)songChanged
 {
 }
 
 - (BOOL)songChanged
 {
-    return ( ! [[currentRemote playerStateUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
+    NSString *identifier = nil;
+    NS_DURING
+        identifier = [[self currentRemote] playerStateUniqueIdentifier];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    return ( ! [identifier isEqualToString:_latestSongIdentifier] );
 }
 
 - (NSString *)latestSongIdentifier
 }
 
 - (NSString *)latestSongIdentifier
@@ -195,33 +353,119 @@ static MainController *sharedController;
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {
-    ITDebugLog(@"Setting latest song identifier to %@", newIdentifier);
+    ITDebugLog(@"Setting latest song identifier:");
+    ITDebugLog(@"   - Identifier: %@", newIdentifier);
     [_latestSongIdentifier autorelease];
     [_latestSongIdentifier autorelease];
-    _latestSongIdentifier = [newIdentifier copy];
+    _latestSongIdentifier = [newIdentifier retain];
 }
 
 - (void)timerUpdate
 {
 }
 
 - (void)timerUpdate
 {
-    if ( [self songChanged] ) {
-        ITDebugLog(@"The song changed.");
-        [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
-        latestPlaylistClass = [currentRemote currentPlaylistClass];
-        [menuController rebuildSubmenus];
-
-        if ( [df boolForKey:@"showSongInfoOnChange"] ) {
-            [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+       if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
+               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 ( [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];
+            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];
+            }
         }
         }
+        
+        timerUpdating = YES;
+        [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:[[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]];
     }
 }
 
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
     }
 }
 
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
-    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
-        [statusItem setMenu:[menuController menu]];
-    } else {
-        [statusItem setMenu:[menuController menuForNoPlayer]];
+       
+       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;
     }
     }
+    
+    NS_DURING
+        if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+            [statusItem setMenu:[menuController menu]];
+        } else {
+            [statusItem setMenu:[menuController menuForNoPlayer]];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
 }
 
 //
 }
 
 //
@@ -232,97 +476,176 @@ static MainController *sharedController;
 
 - (void)playPause
 {
 
 - (void)playPause
 {
-    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
-    ITDebugLog(@"Play/Pause toggled");
-    if (state == ITMTRemotePlayerPlaying) {
-        [currentRemote pause];
-    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
-        [currentRemote pause];
-        [currentRemote play];
-    } else {
-        [currentRemote play];
-    }
+    NS_DURING
+        ITMTRemotePlayerPlayingState state = [[self currentRemote] playerPlayingState];
+        ITDebugLog(@"Play/Pause toggled");
+        if (state == ITMTRemotePlayerPlaying) {
+            [[self currentRemote] pause];
+        } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
+            [[self currentRemote] pause];
+            [[self currentRemote] play];
+        } else {
+            [[self currentRemote] play];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    
     [self timerUpdate];
 }
 
 - (void)nextSong
 {
     ITDebugLog(@"Going to next song.");
     [self timerUpdate];
 }
 
 - (void)nextSong
 {
     ITDebugLog(@"Going to next song.");
-    [currentRemote goToNextSong];
+    NS_DURING
+        [[self currentRemote] goToNextSong];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)prevSong
 {
     ITDebugLog(@"Going to previous song.");
     [self timerUpdate];
 }
 
 - (void)prevSong
 {
     ITDebugLog(@"Going to previous song.");
-    [currentRemote goToPreviousSong];
+    NS_DURING
+        [[self currentRemote] goToPreviousSong];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)fastForward
 {
     ITDebugLog(@"Fast forwarding.");
     [self timerUpdate];
 }
 
 - (void)fastForward
 {
     ITDebugLog(@"Fast forwarding.");
-    [currentRemote forward];
+    NS_DURING
+        [[self currentRemote] forward];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)rewind
 {
     ITDebugLog(@"Rewinding.");
     [self timerUpdate];
 }
 
 - (void)rewind
 {
     ITDebugLog(@"Rewinding.");
-    [currentRemote rewind];
+    NS_DURING
+        [[self currentRemote] rewind];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
     ITDebugLog(@"Selecting playlist %i", index);
     [self timerUpdate];
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
     ITDebugLog(@"Selecting playlist %i", index);
-    [currentRemote switchToPlaylistAtIndex:index];
+    NS_DURING
+        [[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
+        //[[self currentRemote] switchToPlaylistAtIndex:index];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)selectSongAtIndex:(int)index
 {
     ITDebugLog(@"Selecting song %i", index);
     [self timerUpdate];
 }
 
 - (void)selectSongAtIndex:(int)index
 {
     ITDebugLog(@"Selecting song %i", index);
-    [currentRemote switchToSongAtIndex:index];
+    NS_DURING
+        [[self currentRemote] switchToSongAtIndex:index];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)selectSongRating:(int)rating
 {
     ITDebugLog(@"Selecting song rating %i", rating);
     [self timerUpdate];
 }
 
 - (void)selectSongRating:(int)rating
 {
     ITDebugLog(@"Selecting song rating %i", rating);
-    [currentRemote setCurrentSongRating:(float)rating / 100.0];
+    NS_DURING
+        [[self currentRemote] setCurrentSongRating:(float)rating / 100.0];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     ITDebugLog(@"Selecting EQ preset %i", index);
     [self timerUpdate];
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     ITDebugLog(@"Selecting EQ preset %i", index);
-    [currentRemote switchToEQAtIndex:index];
+    NS_DURING
+        if (index == -1) {
+            [[self currentRemote] setEqualizerEnabled:![[self currentRemote] equalizerEnabled]];
+        } else {
+            [[self currentRemote] switchToEQAtIndex:index];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
     [self timerUpdate];
 }
 
     [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
+    ITDebugLog(@"Done making playlist");
+}
+
 - (void)showPlayer
 {
     ITDebugLog(@"Beginning show player.");
 - (void)showPlayer
 {
     ITDebugLog(@"Beginning show player.");
-    if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
+    //if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         ITDebugLog(@"Showing player interface.");
         ITDebugLog(@"Showing player interface.");
-        [currentRemote showPrimaryInterface];
-    } else {
+        NS_DURING
+            [[self currentRemote] showPrimaryInterface];
+        NS_HANDLER
+            [self networkError:localException];
+        NS_ENDHANDLER
+    /*} else {
         ITDebugLog(@"Launching player.");
         ITDebugLog(@"Launching player.");
-        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
-            ITDebugLog(@"Error Launching Player");
-        }
-    }
+        NS_DURING
+            NSString *path;
+            if ( (path = [df stringForKey:@"CustomPlayerPath"]) ) {
+            } else {
+                pathITDebugLog(@"Showing player interface."); = [[self currentRemote] playerFullName];
+            }
+            if (![[NSWorkspace sharedWorkspace] launchApplication:path]) {
+                ITDebugLog(@"Error Launching Player");
+            }
+        NS_HANDLER
+            [self networkError:localException];
+        NS_ENDHANDLER
+    }*/
     ITDebugLog(@"Finished show player.");
 }
 
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");
     ITDebugLog(@"Finished show player.");
 }
 
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");
-    [[PreferencesController sharedPrefs] setController:self];
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
+- (void)showPreferencesAndClose
+{
+    ITDebugLog(@"Show preferences.");
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
+- (void)showTestWindow
+{
+    [self showCurrentTrackInfo];
+}
+
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
@@ -332,6 +655,11 @@ static MainController *sharedController;
 //
 //
 
 //
 //
 
+- (MenuController *)menuController
+{
+    return menuController;
+}
+
 - (void)closePreferences
 {
     ITDebugLog(@"Preferences closed.");
 - (void)closePreferences
 {
     ITDebugLog(@"Preferences closed.");
@@ -342,6 +670,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
 
 - (ITMTRemote *)currentRemote
 {
+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }
     return currentRemote;
 }
 
     return currentRemote;
 }
 
@@ -366,6 +698,11 @@ static MainController *sharedController;
 {
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
 {
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
+    
+    if (playerRunningState == ITMTRemotePlayerNotRunning && ![[NetworkController sharedController] isConnectedToServer]) {
+        return;
+    }
+    
     if ([df objectForKey:@"PlayPause"] != nil) {
         ITDebugLog(@"Setting up play pause hot key.");
         hotKey = [[ITHotKey alloc] init];
     if ([df objectForKey:@"PlayPause"] != nil) {
         ITDebugLog(@"Setting up play pause hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -396,6 +733,26 @@ static MainController *sharedController;
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
         [[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];
     if ([df objectForKey:@"ShowPlayer"] != nil) {
         ITDebugLog(@"Setting up show player hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -485,41 +842,114 @@ static MainController *sharedController;
         [hotKey setAction:@selector(decrementRating)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
         [hotKey setAction:@selector(decrementRating)];
         [[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)showCurrentTrackInfo
 {
     ITDebugLog(@"Finished setting up hot keys.");
 }
 
 - (void)showCurrentTrackInfo
 {
-    ITMTRemotePlayerSource  source      = [currentRemote currentSource];
-    NSString               *title       = [currentRemote currentSongTitle];
+    ITMTRemotePlayerSource  source      = 0;
+    NSString               *title       = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
+    NSString               *composer    = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
+    NSImage                *art         = nil;
     int                     rating      = -1;
     int                     rating      = -1;
+    int                     playCount   = -1;
     
     ITDebugLog(@"Showing track info status window.");
     
     
     ITDebugLog(@"Showing track info status window.");
     
+    NS_DURING
+        source      = [[self currentRemote] currentSource];
+        title       = [[self currentRemote] currentSongTitle];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    
     if ( title ) {
     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"] ) {
         if ( [df boolForKey:@"showAlbum"] ) {
-            album = [currentRemote currentSongAlbum];
+            NS_DURING
+                album = [[self currentRemote] currentSongAlbum];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
         }
 
         if ( [df boolForKey:@"showArtist"] ) {
         }
 
         if ( [df boolForKey:@"showArtist"] ) {
-            artist = [currentRemote currentSongArtist];
+            NS_DURING
+                artist = [[self currentRemote] currentSongArtist];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+
+        if ( [df boolForKey:@"showComposer"] ) {
+            NS_DURING
+                composer = [[self currentRemote] currentSongComposer];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
         }
 
         if ( [df boolForKey:@"showTime"] ) {
         }
 
         if ( [df boolForKey:@"showTime"] ) {
-            time = [NSString stringWithFormat:@"%@: %@ / %@",
-                @"Time",
-                [currentRemote currentSongElapsed],
-                [currentRemote currentSongLength]];
+            NS_DURING
+                time = [NSString stringWithFormat:@"%@: %@ / %@",
+                NSLocalizedString(@"time", @"Time"),
+                [[self currentRemote] currentSongElapsed],
+                [[self currentRemote] currentSongLength]];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
-            int trackNo    = [currentRemote currentSongTrack];
-            int trackCount = [currentRemote currentAlbumTrackCount];
+            int trackNo    = 0;
+            int trackCount = 0;
+            
+            NS_DURING
+                trackNo    = [[self currentRemote] currentSongTrack];
+                trackCount = [[self currentRemote] currentAlbumTrackCount];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
             
             if ( (trackNo > 0) || (trackCount > 0) ) {
                 track = [NSString stringWithFormat:@"%@: %i %@ %i",
             
             if ( (trackNo > 0) || (trackCount > 0) ) {
                 track = [NSString stringWithFormat:@"%@: %i %@ %i",
@@ -528,146 +958,405 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {
-            rating = ( [currentRemote currentSongRating] * 5 );
+            float currentRating = 0;
+            
+            NS_DURING
+                currentRating = [[self currentRemote] currentSongRating];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+            
+            if (currentRating >= 0.0) {
+                rating = ( currentRating * 5 );
+            }
         }
         
         }
         
+        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.");
     }
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
-
+    ITDebugLog(@"Showing current track info status window.");
     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
                                                   artist:artist
     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
                                                   artist:artist
+                                                composer:composer
                                                     time:time
                                                    track:track
                                                     time:time
                                                    track:track
-                                                  rating:rating];
+                                                  rating:rating
+                                               playCount:playCount
+                                                   image:art];
 }
 
 - (void)showUpcomingSongs
 {
 }
 
 - (void)showUpcomingSongs
 {
-    int curPlaylist = [currentRemote currentPlaylistIndex];
-    int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
+    int numSongs = 0;
+    NS_DURING
+        numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    
     ITDebugLog(@"Showing upcoming songs status window.");
     ITDebugLog(@"Showing upcoming songs status window.");
-    if (numSongs > 0) {
-        NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];
-        int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
-        int curTrack = [currentRemote currentSongIndex];
-        int i;
-
-        for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
-            if (i <= numSongs) {
-                [songList addObject:[currentRemote songTitleAtIndex:i]];
+    NS_DURING
+        if (numSongs > 0) {
+            int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
+            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:numSongsInAdvance];
+            int curTrack = [[self currentRemote] currentSongIndex];
+            int i;
+    
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+                if (i <= numSongs) {
+                    [songList addObject:[[self currentRemote] songTitleAtIndex:i]];
+                }
             }
             }
+            
+            if ([songList count] == 0) {
+                [songList addObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")];
+            }
+            
+            [statusWindowController showUpcomingSongsWindowWithTitles:songList];
+        } else {
+            [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    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
+        float volume  = [[self currentRemote] volume];
+        float dispVol = volume;
+        ITDebugLog(@"Incrementing volume.");
+        volume  += 0.110;
+        dispVol += 0.100;
+        
+        if (volume > 1.0) {
+            volume  = 1.0;
+            dispVol = 1.0;
+        }
+    
+        ITDebugLog(@"Setting volume to %f", volume);
+        [[self currentRemote] setVolume:volume];
+    
+        // Show volume status window
+        [statusWindowController showVolumeWindowWithLevel:dispVol];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)decrementVolume
+{
+    NS_DURING
+        float volume  = [[self currentRemote] volume];
+        float dispVol = volume;
+        ITDebugLog(@"Decrementing volume.");
+        volume  -= 0.090;
+        dispVol -= 0.100;
+    
+        if (volume < 0.0) {
+            volume  = 0.0;
+            dispVol = 0.0;
+        }
+        
+        ITDebugLog(@"Setting volume to %f", volume);
+        [[self currentRemote] setVolume:volume];
+        
+        //Show volume status window
+        [statusWindowController showVolumeWindowWithLevel:dispVol];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)incrementRating
+{
+    NS_DURING
+        float rating = [[self currentRemote] currentSongRating];
+        ITDebugLog(@"Incrementing rating.");
+        
+        if ([[self currentRemote] currentPlaylistIndex] == 0) {
+            ITDebugLog(@"No song playing, rating change aborted.");
+            return;
+        }
+        
+        rating += 0.2;
+        if (rating > 1.0) {
+            rating = 1.0;
         }
         }
+        ITDebugLog(@"Setting rating to %f", rating);
+        [[self currentRemote] setCurrentSongRating:rating];
         
         
-        [statusWindowController showUpcomingSongsWindowWithTitles:songList];
+        //Show rating status window
+        [statusWindowController showRatingWindowWithRating:rating];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)decrementRating
+{
+    NS_DURING
+        float rating = [[self currentRemote] currentSongRating];
+        ITDebugLog(@"Decrementing rating.");
+        
+        if ([[self currentRemote] currentPlaylistIndex] == 0) {
+            ITDebugLog(@"No song playing, rating change aborted.");
+            return;
+        }
+        
+        rating -= 0.2;
+        if (rating < 0.0) {
+            rating = 0.0;
+        }
+        ITDebugLog(@"Setting rating to %f", rating);
+        [[self currentRemote] setCurrentSongRating:rating];
+        
+        //Show rating status window
+        [statusWindowController showRatingWindowWithRating:rating];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)setRating:(ITHotKey *)sender
+{
+    int stars = [[sender name] characterAtIndex:9] - 48;
+    [self selectSongRating:stars * 20];
+    [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+}
+
+- (void)toggleLoop
+{
+    NS_DURING
+        ITMTRemotePlayerRepeatMode repeatMode = [[self currentRemote] repeatMode];
+        ITDebugLog(@"Toggling repeat mode.");
+        switch (repeatMode) {
+            case ITMTRemotePlayerRepeatOff:
+                repeatMode = ITMTRemotePlayerRepeatAll;
+            break;
+            case ITMTRemotePlayerRepeatAll:
+                repeatMode = ITMTRemotePlayerRepeatOne;
+            break;
+            case ITMTRemotePlayerRepeatOne:
+                repeatMode = ITMTRemotePlayerRepeatOff;
+            break;
+        }
+        ITDebugLog(@"Setting repeat mode to %i", repeatMode);
+        [[self currentRemote] setRepeatMode:repeatMode];
         
         
+        //Show loop status window
+        [statusWindowController showRepeatWindowWithMode:repeatMode];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)toggleShuffle
+{
+    NS_DURING
+        BOOL newShuffleEnabled = ( ! [[self currentRemote] shuffleEnabled] );
+        ITDebugLog(@"Toggling shuffle mode.");
+        [[self currentRemote] setShuffleEnabled:newShuffleEnabled];
+        //Show shuffle status window
+        ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+        [statusWindowController showShuffleWindow:newShuffleEnabled];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
+- (void)registerNowOK
+{
+    [[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];
+}
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark NETWORK HANDLERS
+/*************************************************************************/
+
+- (void)setServerStatus:(BOOL)newStatus
+{
+    if (newStatus) {
+        //Turn on
+        [networkController setServerStatus:YES];
     } else {
     } else {
-        [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
+        //Tear down
+        [networkController setServerStatus:NO];
     }
 }
 
     }
 }
 
-- (void)incrementVolume
+- (int)connectToServer
 {
 {
-    float volume  = [currentRemote volume];
-    float dispVol = volume;
-    ITDebugLog(@"Incrementing volume.");
-    volume  += 0.110;
-    dispVol += 0.100;
-    
-    if (volume > 1.0) {
-        volume  = 1.0;
-        dispVol = 1.0;
+    int result;
+    ITDebugLog(@"Attempting to connect to shared remote.");
+    result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];
+    //Connect
+    if (result == 1) {
+        [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
+        currentRemote = [[[networkController networkObject] remote] retain];
+        
+        [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];
+        [self timerUpdate];
+        ITDebugLog(@"Connection successful.");
+        return 1;
+    } else if (result == 0) {
+        ITDebugLog(@"Connection failed.");
+        currentRemote = [remoteArray objectAtIndex:0];
+        return 0;
+    } else {
+        //Do something about the password being invalid
+        ITDebugLog(@"Connection failed.");
+        currentRemote = [remoteArray objectAtIndex:0];
+        return -1;
     }
     }
+}
 
 
-    ITDebugLog(@"Setting volume to %f", volume);
-    [currentRemote setVolume:volume];
+- (BOOL)disconnectFromServer
+{
+    ITDebugLog(@"Disconnecting from shared remote.");
+    //Disconnect
+    [currentRemote release];
+    currentRemote = [remoteArray objectAtIndex:0];
+    [networkController disconnect];
+    
+    if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+        [self applicationLaunched:nil];
+    } else {
+        [self applicationTerminated:nil];
+    }
+    [self timerUpdate];
+    return YES;
+}
 
 
-    // Show volume status window
-    [statusWindowController showVolumeWindowWithLevel:dispVol];
+- (void)checkForRemoteServer
+{
+    [self checkForRemoteServerAndConnectImmediately:NO];
 }
 
 }
 
-- (void)decrementVolume
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately
 {
 {
-    float volume  = [currentRemote volume];
-    float dispVol = volume;
-    ITDebugLog(@"Decrementing volume.");
-    volume  -= 0.090;
-    dispVol -= 0.100;
+    ITDebugLog(@"Checking for remote server.");
+    if (!_checkingForServer) {
+        if (!_serverCheckLock) {
+            _serverCheckLock = [[NSLock alloc] init];
+        }
+        [_serverCheckLock lock];
+        _checkingForServer = YES;
+        [_serverCheckLock unlock];
+        [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:[NSNumber numberWithBool:connectImmediately]];
+    }
+}
 
 
-    if (volume < 0.0) {
-        volume  = 0.0;
-        dispVol = 0.0;
+- (void)runRemoteServerCheck:(id)sender
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    ITDebugLog(@"Remote server check running.");
+    if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
+        ITDebugLog(@"Remote server found.");
+        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];
     }
     }
-    
-    ITDebugLog(@"Setting volume to %f", volume);
-    [currentRemote setVolume:volume];
-    
-    //Show volume status window
-    [statusWindowController showVolumeWindowWithLevel:dispVol];
+    [_serverCheckLock lock];
+    _checkingForServer = NO;
+    [_serverCheckLock unlock];
+    [pool release];
 }
 
 }
 
-- (void)incrementRating
+- (void)remoteServerFound:(id)sender
 {
 {
-    float rating = [currentRemote currentSongRating];
-    ITDebugLog(@"Incrementing rating.");
-    rating += 0.2;
-    if (rating > 1.0) {
-        rating = 1.0;
+    if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+        [[StatusWindowController sharedController] showReconnectQueryWindow];
     }
     }
-    ITDebugLog(@"Setting rating to %f", rating);
-    [currentRemote setCurrentSongRating:rating];
-    
-    //Show rating status window
-    [statusWindowController showRatingWindowWithRating:rating];
 }
 
 }
 
-- (void)decrementRating
+- (void)remoteServerNotFound:(id)sender
 {
 {
-    float rating = [currentRemote currentSongRating];
-    ITDebugLog(@"Decrementing rating.");
-    rating -= 0.2;
-    if (rating < 0.0) {
-        rating = 0.0;
+    if (![[NetworkController sharedController] isConnectedToServer]) {
+        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
     }
     }
-    ITDebugLog(@"Setting rating to %f", rating);
-    [currentRemote setCurrentSongRating:rating];
-    
-    //Show rating status window
-    [statusWindowController showRatingWindowWithRating:rating];
 }
 
 }
 
-- (void)toggleLoop
+- (void)networkError:(NSException *)exception
 {
 {
-    ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
-    ITDebugLog(@"Toggling repeat mode.");
-    switch (repeatMode) {
-        case ITMTRemotePlayerRepeatOff:
-            repeatMode = ITMTRemotePlayerRepeatAll;
-        break;
-        case ITMTRemotePlayerRepeatAll:
-            repeatMode = ITMTRemotePlayerRepeatOne;
-        break;
-        case ITMTRemotePlayerRepeatOne:
-            repeatMode = ITMTRemotePlayerRepeatOff;
-        break;
+    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);
+        [[StatusWindowController sharedController] showNetworkErrorQueryWindow];
+        if ([self disconnectFromServer]) {
+            [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
+            [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+        } else {
+            ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
+        }
     }
     }
-    ITDebugLog(@"Setting repeat mode to %i", repeatMode);
-    [currentRemote setRepeatMode:repeatMode];
-    
-    //Show loop status window
-    [statusWindowController showRepeatWindowWithMode:repeatMode];
 }
 
 }
 
-- (void)toggleShuffle
+- (void)reconnect
+{
+    /*if ([self connectToServer] == 0) {
+        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+    }*/
+    [self checkForRemoteServerAndConnectImmediately:YES];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
+- (void)cancelReconnect
 {
 {
-    BOOL newShuffleEnabled = ( ! [currentRemote shuffleEnabled] );
-    ITDebugLog(@"Toggling shuffle mode.");
-    [currentRemote setShuffleEnabled:newShuffleEnabled];
-    //Show shuffle status window
-    ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
-    [statusWindowController showShuffleWindow:newShuffleEnabled];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/
@@ -677,33 +1366,54 @@ static MainController *sharedController;
 
 - (void)applicationLaunched:(NSNotification *)note
 {
 
 - (void)applicationLaunched:(NSNotification *)note
 {
-    if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-        ITDebugLog(@"Remote application launched.");
-        [currentRemote begin];
-        [self setLatestSongIdentifier:@""];
-        [self timerUpdate];
-        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
-                             target:self
-                             selector:@selector(timerUpdate)
-                             userInfo:nil
-                             repeats:YES] retain];
-        //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
-        [self setupHotKeys];
-        playerRunningState = ITMTRemotePlayerRunning;
-    }
+    NS_DURING
+        if (!note || ([[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer])) {
+            ITDebugLog(@"Remote application launched.");
+            playerRunningState = ITMTRemotePlayerRunning;
+            [[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];
+            //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+            [self setupHotKeys];
+        }
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
 }
 
  - (void)applicationTerminated:(NSNotification *)note
  {
 }
 
  - (void)applicationTerminated:(NSNotification *)note
  {
-     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-        ITDebugLog(@"Remote application terminated.");
-        [currentRemote halt];
-        [refreshTimer invalidate];
-        [refreshTimer release];
-        refreshTimer = nil;
-        [self clearHotKeys];
-        playerRunningState = ITMTRemotePlayerNotRunning;
-     }
+    NS_DURING
+        if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer]) {
+            ITDebugLog(@"Remote application terminated.");
+            playerRunningState = ITMTRemotePlayerNotRunning;
+            [[self currentRemote] halt];
+            [refreshTimer invalidate];
+            [refreshTimer release];
+            refreshTimer = 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.");
+                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_ENDHANDLER
  }
 
 
  }
 
 
@@ -714,6 +1424,7 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
+    [networkController stopRemoteServerSearch];
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
@@ -731,8 +1442,9 @@ static MainController *sharedController;
     [statusItem release];
     [statusWindowController release];
     [menuController release];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
+    [networkController release];
+    [_serverCheckLock release];
     [super dealloc];
 }
 
     [super dealloc];
 }
 
-
-@end
\ No newline at end of file
+@end
Menu-based iTunes controller.