X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/1527a78c2e1b1cc525a5c4621077844989aab6fd..e5c183a31067923163f346d2fe64f367b0e0c542:/MainController.m?ds=sidebyside

diff --git a/MainController.m b/MainController.m
index 2517c39..2a1e7dc 100755
--- a/MainController.m
+++ b/MainController.m
@@ -11,6 +11,10 @@
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
+@interface NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
 @interface NSCarbonMenuImpl:NSObject
 {
     NSMenu *_menu;
@@ -143,13 +147,13 @@ static MainController *sharedController;
                 withLength:NSSquareStatusItemLength];
     }
     
-    bling = [[MTBlingController alloc] init];
+    /*bling = [[MTBlingController alloc] init];
     [self blingTime];
     registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0
                              target:self
                              selector:@selector(blingTime)
                              userInfo:nil
-                             repeats:YES] retain];
+                             repeats:YES] retain];*/
     
     NS_DURING
         if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
@@ -169,6 +173,27 @@ static MainController *sharedController;
 
     [networkController startRemoteServerSearch];
     [NSApp deactivate];
+	[self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];
+	
+	bling = [[MTBlingController alloc] init];
+    [self blingTime];
+    registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0
+                             target:self
+                             selector:@selector(blingTime)
+                             userInfo:nil
+                             repeats:YES] retain];
+}
+
+- (void)rawr
+{
+	_open = YES;
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)note
+{
+	if (_open && !blinged && ![NSApp mainWindow] && ![[StatusWindow sharedWindow] isVisible]) {
+		[[MainController sharedController] showPreferences];
+	}
 }
 
 - (ITMTRemote *)loadRemote
@@ -271,16 +296,18 @@ static MainController *sharedController;
         if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) && (blinged != YES) ) {
             blinged = YES;
             [statusItem setEnabled:NO];
-            [self clearHotKeys];
+			[[ITHotKeyCenter sharedCenter] setEnabled:NO];
             if ([refreshTimer isValid]) {
                 [refreshTimer invalidate];
+				[refreshTimer release];
+				refreshTimer = nil;
             }
             [statusWindowController showRegistrationQueryWindow];
         }
     } else {
         if (blinged) {
             [statusItem setEnabled:YES];
-            [self setupHotKeys];
+            [[ITHotKeyCenter sharedCenter] setEnabled:YES];
             if (![refreshTimer isValid]) {
                 [refreshTimer release];
                 refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
@@ -357,9 +384,23 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
-        ITDebugLog(@"The song changed.");
-        
+	NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	if (refreshTimer && identifier == 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];
@@ -378,42 +419,39 @@ static MainController *sharedController;
         
         timerUpdating = YES;
         [statusItem setEnabled:NO];
-        
+		
         NS_DURING
             latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
-            [menuController rebuildSubmenus];
-    
-            if ( [df boolForKey:@"showSongInfoOnChange"] ) {
-                [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
-            }
-            
-            [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
-            
-            //Create the tooltip for the status item
-            if ( [df boolForKey:@"showToolTip"] ) {
-                NSString *artist = [[self currentRemote] currentSongArtist];
-                NSString *title = [[self currentRemote] currentSongTitle];
-                NSString *toolTip;
-                ITDebugLog(@"Creating status item tooltip.");
-                if (artist) {
-                    toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
-                } else if (title) {
-                    toolTip = title;
-                } else {
-                    toolTip = @"No Song Playing";
-                }
-                [statusItem setToolTip:toolTip];
-            } else {
-                [statusItem setToolTip:nil];
-            }
+			
+			if ([menuController rebuildSubmenus]) {
+				if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+					[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+				}
+				[self setLatestSongIdentifier:identifier];
+				//Create the tooltip for the status item
+				if ( [df boolForKey:@"showToolTip"] ) {
+					NSString *artist = [[self currentRemote] currentSongArtist];
+					NSString *title = [[self currentRemote] currentSongTitle];
+					ITDebugLog(@"Creating status item tooltip.");
+					if (artist) {
+						_toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+					} else if (title) {
+						_toolTip = title;
+					} else {
+						_toolTip = @"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]];
     }
@@ -422,6 +460,27 @@ static MainController *sharedController;
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
+	
+	if (([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning) {
+		if (refreshTimer) {
+			if ([statusItem isEnabled]) {
+				[statusItem setToolTip:@"iTunes not responding."];
+				[[ITHotKeyCenter sharedCenter] setEnabled:NO];
+			}
+			[statusItem setEnabled:NO];
+		} else {
+			NSMenu *menu = [[NSMenu alloc] init];
+			[menu addItemWithTitle:@"iTunes Not Responding" action:nil keyEquivalent:@""];
+			[statusItem setMenu:[menu autorelease]];
+		}
+		return;
+	} else if (![statusItem isEnabled]) {
+		[statusItem setEnabled:YES];
+		[statusItem setToolTip:_toolTip];
+		[[ITHotKeyCenter sharedCenter] setEnabled:YES];
+		return;
+	}
+	
     if ([networkController isConnectedToServer]) {
         //Used the cached version
         return;
@@ -438,6 +497,81 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)trackChanged:(NSNotification *)note
+{
+	//If we're running the timer, shut it off since we don't need it!
+	if (refreshTimer && [refreshTimer isValid]) {
+		ITDebugLog(@"Invalidating refresh timer.");
+		[refreshTimer invalidate];
+		[refreshTimer release];
+		refreshTimer = nil;
+	}
+	
+	if (![self songChanged]) {
+		return;
+	}
+	NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+		[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+	}
+	[_lastTrackInfo release];
+	_lastTrackInfo = [[note userInfo] retain];
+	
+	[self setLatestSongIdentifier:identifier];
+	ITDebugLog(@"The song changed. '%@'", _latestSongIdentifier);
+	if ([df boolForKey:@"runScripts"]) {
+		NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
+		NSEnumerator *scriptsEnum = [scripts objectEnumerator];
+		NSString *nextScript;
+		ITDebugLog(@"Running AppleScripts for song change.");
+		while ( (nextScript = [scriptsEnum nextObject]) ) {
+			NSDictionary *error;
+			NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
+			ITDebugLog(@"Running script: %@", nextScript);
+			if (!currentScript || ![currentScript executeAndReturnError:nil]) {
+				ITDebugLog(@"Error running script %@.", nextScript);
+			}
+			[currentScript release];
+		}
+	}
+	
+	[statusItem setEnabled:NO];
+	
+	NS_DURING
+		latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
+		
+		if ([menuController rebuildSubmenus]) {
+			/*if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+				[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+			}*/
+			[self setLatestSongIdentifier:identifier];
+			//Create the tooltip for the status item
+			if ( [df boolForKey:@"showToolTip"] ) {
+				ITDebugLog(@"Creating status item tooltip.");
+				NSString *artist = [_lastTrackInfo objectForKey:@"Artist"], *title = [_lastTrackInfo objectForKey:@"Name"];
+				if (artist) {
+					_toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+				} else if (title) {
+					_toolTip = title;
+				} else {
+					_toolTip = @"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]];
+    }
+}
+
 //
 //
 // Menu Selectors
@@ -461,7 +595,9 @@ static MainController *sharedController;
         [self networkError:localException];
     NS_ENDHANDLER
     
-    [self timerUpdate];
+	if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)nextSong
@@ -472,7 +608,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)prevSong
@@ -483,7 +621,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)fastForward
@@ -494,7 +634,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)rewind
@@ -505,7 +647,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectPlaylistAtIndex:(int)index
@@ -517,7 +661,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectSongAtIndex:(int)index
@@ -528,7 +674,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectSongRating:(int)rating
@@ -539,7 +687,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectEQPresetAtIndex:(int)index
@@ -554,7 +704,20 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
+}
+
+- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type
+{
+    ITDebugLog(@"Making playlist with term %@, type %i", term, type);
+    NS_DURING
+        [[self currentRemote] makePlaylistWithTerm:term ofType:type];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    ITDebugLog(@"Done making playlist");
 }
 
 - (void)showPlayer
@@ -891,7 +1054,7 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",
-                @"Time",
+                NSLocalizedString(@"time", @"Time"),
                 [[self currentRemote] currentSongElapsed],
                 [[self currentRemote] currentSongLength]];
             NS_HANDLER
@@ -930,7 +1093,7 @@ static MainController *sharedController;
             }
         }
         
-        if ( [df boolForKey:@"showPlayCount"] ) {
+        if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] && [[self currentRemote] currentSource] == ITMTRemoteLibrarySource ) {
             NS_DURING
                 playCount = [[self currentRemote] currentSongPlayCount];
             NS_HANDLER
@@ -991,8 +1154,13 @@ static MainController *sharedController;
 
 - (void)popupMenu
 {
-    NSMenu *menu = [menuController menu];
-    [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+    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
@@ -1095,9 +1263,9 @@ static MainController *sharedController;
 
 - (void)setRating:(ITHotKey *)sender
 {
-    float rating = ([[sender name] characterAtIndex:9] - 48) / 5.0;
-    [self selectSongRating:rating];
-    [statusWindowController showRatingWindowWithRating:rating];
+    int stars = [[sender name] characterAtIndex:9] - 48;
+    [self selectSongRating:stars * 20];
+    [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
 }
 
 - (void)toggleLoop
@@ -1187,8 +1355,9 @@ static MainController *sharedController;
         [self setupHotKeys];
         //playerRunningState = ITMTRemotePlayerRunning;
         playerRunningState = [[self currentRemote] playerRunningState];
-        
-        [refreshTimer invalidate];
+		if (refreshTimer) {
+			[refreshTimer invalidate];
+		}
         refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
                                 target:self
                                 selector:@selector(timerUpdate)
@@ -1222,7 +1391,9 @@ static MainController *sharedController;
     } else {
         [self applicationTerminated:nil];
     }
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	};
     return YES;
 }
 
@@ -1333,6 +1504,9 @@ static MainController *sharedController;
                                 userInfo:nil
                                 repeats:YES] retain];
             //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+			if (![df boolForKey:@"UsePollingOnly"]) {
+				[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(trackChanged:) name:@"ITMTTrackChanged" object:nil];
+			}
             [self setupHotKeys];
         }
     NS_HANDLER
@@ -1350,8 +1524,12 @@ static MainController *sharedController;
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
+			[[NSNotificationCenter defaultCenter] removeObserver:self];
+			[statusItem setEnabled:YES];
+			[statusItem setToolTip:@"iTunes not running."];
             [self clearHotKeys];
-            
+
+			
             if ([df objectForKey:@"ShowPlayer"] != nil) {
                 ITHotKey *hotKey;
                 ITDebugLog(@"Setting up show player hot key.");
@@ -1376,6 +1554,7 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
+	[[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
     [networkController stopRemoteServerSearch];
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];