Status windows with buttons now scale properly.

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 2f4f820..a543288 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -2,6 +2,7 @@
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "NetworkController.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>


@@ -9,11 +10,34 @@
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 

+@interface NSImage (WeeAdditions)
+- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize;
+@end
+
+@implementation NSImage (WeeAdditions)
+
+- (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;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;

-- (void)showCurrentTrackInfo;

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


@@ -38,6 +62,7 @@ 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];


@@ -54,6 +79,13 @@ static MainController *sharedController;
         SetITDebugMode(YES);
     }
     
         SetITDebugMode(YES);
     }
     

+    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];
     [[self currentRemote] begin];
     
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     


@@ -62,7 +94,7 @@ static MainController *sharedController;
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {

-        if (![self connectToServer]) {
+        if ([self connectToServer] == 0) {

             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         }
     }
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         }
     }


@@ -84,10 +116,14 @@ static MainController *sharedController;
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     

-    [StatusItemHack install];
-    statusItem = [[ITStatusItem alloc]
-            initWithStatusBar:[NSStatusBar systemStatusBar]
-            withLength:NSSquareStatusItemLength];
+    if ([df boolForKey:@"ITMTNoStatusItem"]) {
+        statusItem = nil;
+    } else {
+        [StatusItemHack install];
+        statusItem = [[ITStatusItem alloc]
+                initWithStatusBar:[NSStatusBar systemStatusBar]
+                withLength:NSSquareStatusItemLength];
+    }

     
     bling = [[MTBlingController alloc] init];
     [self blingTime];
     
     bling = [[MTBlingController alloc] init];
     [self blingTime];


@@ -178,8 +214,10 @@ static MainController *sharedController;
     globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
     if (date) {
         [globalPrefs setObject:date forKey:@"ITMTTrialStart"];
     globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
     if (date) {
         [globalPrefs setObject:date forKey:@"ITMTTrialStart"];

+        [globalPrefs setObject:[NSNumber numberWithInt:1200] forKey:@"ITMTTrialVers"];

     } else {
         [globalPrefs removeObjectForKey:@"ITMTTrialStart"];
     } else {
         [globalPrefs removeObjectForKey:@"ITMTTrialStart"];

+        [globalPrefs removeObjectForKey:@"ITMTTrialVers"];

     }
     [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
     [df synchronize];
     }
     [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
     [df synchronize];


@@ -198,7 +236,20 @@ static MainController *sharedController;
     if (![self blingBling]) {
         if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
             [self setBlingTime:now];
     if (![self blingBling]) {
         if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
             [self setBlingTime:now];

+        } else if ([[[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialVers"] intValue] < 1200) {
+            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:1200] forKey:@"ITMTTrialVers"];
+                [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
+                [df synchronize];
+                [globalPrefs release];
+            }

         }
         }

+        

         if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) && (blinged != YES) ) {
             blinged = YES;
             [statusItem setEnabled:NO];
         if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) && (blinged != YES) ) {
             blinged = YES;
             [statusItem setEnabled:NO];


@@ -242,7 +293,7 @@ static MainController *sharedController;
 
 - (BOOL)songIsPlaying
 {
 
 - (BOOL)songIsPlaying
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -253,7 +304,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
 
 - (BOOL)radioIsPlaying
 {

-    ITMTRemotePlayerPlaylistClass class;
+    ITMTRemotePlayerPlaylistClass class = nil;

     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER


@@ -264,7 +315,7 @@ static MainController *sharedController;
 
 - (BOOL)songChanged
 {
 
 - (BOOL)songChanged
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -291,8 +342,23 @@ static MainController *sharedController;
         [statusItem setMenu:[menuController menu]];
     }
     
         [statusItem setMenu:[menuController menu]];
     }
     

-    if ( [self songChanged] && (timerUpdating != YES) ) {
+    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {

         ITDebugLog(@"The song changed.");
         ITDebugLog(@"The song changed.");

+        
+        if ([df boolForKey:@"runScripts"]) {
+            NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
+            NSEnumerator *scriptsEnum = [scripts objectEnumerator];
+            NSString *nextScript;
+            while ( (nextScript = [scriptsEnum nextObject]) ) {
+                NSDictionary *error;
+                NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
+                if (!currentScript || ![currentScript executeAndReturnError:nil]) {
+                    ITDebugLog(@"Error running script %@.", nextScript);
+                }
+                [currentScript release];
+            }
+        }
+        

         timerUpdating = YES;
         
         NS_DURING
         timerUpdating = YES;
         
         NS_DURING


@@ -304,6 +370,18 @@ static MainController *sharedController;
             }
             
             [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
             }
             
             [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];

+            
+            NSString *artist = [[self currentRemote] currentSongArtist];
+            NSString *title = [[self currentRemote] currentSongTitle];
+            NSString *toolTip;
+            if (artist) {
+                toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+            } else if (title) {
+                toolTip = title;
+            } else {
+                toolTip = @"No Song Playing";
+            }
+            [statusItem setToolTip:toolTip];

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


@@ -405,7 +483,8 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING

-        [[self currentRemote] switchToPlaylistAtIndex:index];
+        [[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
+        //[[self currentRemote] switchToPlaylistAtIndex:index];

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


@@ -458,7 +537,12 @@ static MainController *sharedController;
     } else {
         ITDebugLog(@"Launching player.");
         NS_DURING
     } else {
         ITDebugLog(@"Launching player.");
         NS_DURING

-            if (![[NSWorkspace sharedWorkspace] launchApplication:[[self currentRemote] playerFullName]]) {
+            NSString *path;
+            if ( (path = [df stringForKey:@"CustomPlayerPath"]) ) {
+            } else {
+                path = [[self currentRemote] playerFullName];
+            }
+            if (![[NSWorkspace sharedWorkspace] launchApplication:path]) {

                 ITDebugLog(@"Error Launching Player");
             }
         NS_HANDLER
                 ITDebugLog(@"Error Launching Player");
             }
         NS_HANDLER


@@ -471,10 +555,23 @@ static MainController *sharedController;
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");
 - (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.");


@@ -494,6 +591,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
 
 - (ITMTRemote *)currentRemote
 {

+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }

     return currentRemote;
 }
 
     return currentRemote;
 }
 


@@ -647,12 +748,13 @@ static MainController *sharedController;
 
 - (void)showCurrentTrackInfo
 {
 
 - (void)showCurrentTrackInfo
 {

-    ITMTRemotePlayerSource  source;
-    NSString               *title;
+    ITMTRemotePlayerSource  source      = 0;
+    NSString               *title       = nil;

     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;

+    NSImage                *art         = nil;

     int                     rating      = -1;
     
     NS_DURING
     int                     rating      = -1;
     
     NS_DURING


@@ -694,8 +796,8 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {

-            int trackNo;
-            int trackCount;
+            int trackNo    = 0;
+            int trackCount = 0;

             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];
             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];


@@ -711,7 +813,7 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {

-            float currentRating;
+            float currentRating = 0;

             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];
             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];


@@ -724,23 +826,35 @@ 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];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+        

     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }

-

     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
                                                   artist:artist
                                                     time:time
                                                    track:track
     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
                                                   artist:artist
                                                     time:time
                                                    track:track

-                                                  rating:rating];
+                                                  rating:rating
+                                                   image:art];

 }
 
 - (void)showUpcomingSongs
 {
 }
 
 - (void)showUpcomingSongs
 {

-    int numSongs;
-    
+    int numSongs = 0;

     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER
     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER


@@ -750,8 +864,8 @@ static MainController *sharedController;
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {

-            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];

             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];

+            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:numSongsInAdvance];

             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     
             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     


@@ -761,6 +875,10 @@ static MainController *sharedController;
                 }
             }
             
                 }
             }
             

+            if ([songList count] == 0) {
+                [songList addObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")];
+            }
+            

             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];


@@ -942,19 +1060,33 @@ static MainController *sharedController;
     }
 }
 
     }
 }
 

-- (BOOL)connectToServer
+- (int)connectToServer

 {
 {

+    int result;

     ITDebugLog(@"Attempting to connect to shared remote.");
     ITDebugLog(@"Attempting to connect to shared remote.");

+    result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];

     //Connect
     //Connect

-    if ([networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]]) {
-        currentRemote = [networkController sharedRemote];
+    if (result == 1) {
+        [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
+        currentRemote = [[[networkController networkObject] remote] retain];

         [refreshTimer invalidate];
         [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.");
         ITDebugLog(@"Connection successful.");

-        return YES;
+        return 1;
+    } else if (result == 0) {
+        ITDebugLog(@"Connection failed.");
+        currentRemote = [remoteArray objectAtIndex:0];
+        return 0;

     } else {
     } else {

+        //Do something about the password being invalid

         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];
         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];

-        return NO;
+        return -1;

     }
 }
 
     }
 }
 


@@ -962,6 +1094,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Disconnecting from shared remote.");
     //Disconnect
 {
     ITDebugLog(@"Disconnecting from shared remote.");
     //Disconnect

+    [currentRemote release];

     currentRemote = [remoteArray objectAtIndex:0];
     [networkController disconnect];
     [self timerUpdate];
     currentRemote = [remoteArray objectAtIndex:0];
     [networkController disconnect];
     [self timerUpdate];


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

-        [[StatusWindowController sharedController] showReconnectQueryWindow];
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+            [[StatusWindowController sharedController] showReconnectQueryWindow];
+        }

     } else {
         ITDebugLog(@"Remote server not found.");
     }
     } else {
         ITDebugLog(@"Remote server not found.");
     }


@@ -983,20 +1118,20 @@ static MainController *sharedController;
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);

-    NSLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
-    NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
-    if ([networkController isConnectedToServer] && [self disconnectFromServer]) {
-        if ([[exception name] isEqualToString:NSPortTimeoutException]) {
+    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);
+        if ([self disconnectFromServer]) {
+            [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];

             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];

+        } else {
+            ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");

         }
         }

-    } else {
-        ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");

     }
 }
 
 - (void)reconnect
 {
     }
 }
 
 - (void)reconnect
 {

-    if (![self connectToServer]) {
+    if ([self connectToServer] == 0) {

         [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
     }
     [[StatusWindow sharedWindow] setLocked:NO];
         [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
     }
     [[StatusWindow sharedWindow] setLocked:NO];


@@ -1043,12 +1178,23 @@ static MainController *sharedController;
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");

+            playerRunningState = ITMTRemotePlayerNotRunning;

             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];
             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];

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

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


@@ -1063,8 +1209,8 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {

-    [self clearHotKeys];

     [networkController stopRemoteServerSearch];
     [networkController stopRemoteServerSearch];

+    [self clearHotKeys];

     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 


@@ -1085,5 +1231,4 @@ static MainController *sharedController;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-

 @end
\ No newline at end of file
 @end
\ No newline at end of file