git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
It's just around the world la la la la la!!!!!!
[MenuTunes.git] / MainController.m
diff --git a/MainController.m b/MainController.m
index aaddc7f..065659a 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -39,6 +39,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];
@@ -63,7 +64,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];
         }
     }
@@ -243,7 +244,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
@@ -254,7 +255,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
@@ -265,7 +266,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
@@ -472,10 +473,14 @@ 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)showTestWindow
+{
+    [self showCurrentTrackInfo];
+}
+
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
@@ -648,8 +653,8 @@ 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               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
@@ -695,8 +700,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];
@@ -712,7 +717,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];
@@ -740,8 +745,7 @@ static MainController *sharedController;
 
 - (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
@@ -751,8 +755,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;
     
@@ -762,6 +766,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.")]];
@@ -943,20 +951,27 @@ 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"]]) {
+    if (result == 1) {
+        [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
         currentRemote = [[[networkController networkObject] remote] retain];
         [self timerUpdate];
         currentRemote = [[[networkController networkObject] remote] retain];
         [self timerUpdate];
-        //[refreshTimer invalidate];
         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;
     }
 }
 
     }
 }
 
@@ -977,7 +992,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 isConnectedToServer]) {
+            [[StatusWindowController sharedController] showReconnectQueryWindow];
+        }
     } else {
         ITDebugLog(@"Remote server not found.");
     }
     } else {
         ITDebugLog(@"Remote server not found.");
     }
@@ -986,9 +1003,11 @@ 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]);
-    if ([[exception name] isEqualToString:NSPortTimeoutException]) {
+    NSLog(@"%@", [exception reason]);
+    if ([[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);
-        if ([networkController isConnectedToServer] && [self disconnectFromServer]) {
+        if ([self disconnectFromServer]) {
+            [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
@@ -998,7 +1017,7 @@ static MainController *sharedController;
 
 - (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];
@@ -1051,6 +1070,17 @@ static MainController *sharedController;
             refreshTimer = nil;
             [self clearHotKeys];
             playerRunningState = ITMTRemotePlayerNotRunning;
             refreshTimer = nil;
             [self clearHotKeys];
             playerRunningState = ITMTRemotePlayerNotRunning;
+            
+            if ([df objectForKey:@"ShowPlayer"] != nil) {
+                ITHotKey *hotKey;
+                ITDebugLog(@"Setting up show player hot key.");
+                hotKey = [[ITHotKey alloc] init];
+                [hotKey setName:@"ShowPlayer"];
+                [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
+                [hotKey setTarget:self];
+                [hotKey setAction:@selector(showPlayer)];
+                [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+            }
         }
     NS_HANDLER
         [self networkError:localException];
         }
     NS_HANDLER
         [self networkError:localException];
@@ -1065,8 +1095,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];
 }
 
@@ -1087,5 +1117,4 @@ static MainController *sharedController;
     [super dealloc];
 }
 
     [super dealloc];
 }
 
-
 @end
\ No newline at end of file
 @end
\ No newline at end of file
Menu-based iTunes controller.