X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/63f681aa84af3e136fdb4b5fdbaa4a428a063bd7..d7c39a05d1ea7368700d2140c7f042cc72cf0d0d:/MainController.m

diff --git a/MainController.m b/MainController.m
index b2ea25e..294e52c 100755
--- a/MainController.m
+++ b/MainController.m
@@ -479,11 +479,12 @@ static MainController *sharedController;
 			
 			if ([df boolForKey:@"audioscrobblerEnabled"]) {
 				int length = [[self currentRemote] currentSongDuration];
-				if (_audioscrobblerTimer) {
-					[_audioscrobblerTimer invalidate];
-				}
 				if (length > 30) {
-					_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+					_audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+					[_audioscrobblerTimer invalidate];
+					[_audioscrobblerTimer release];
+					_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:nil target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+					[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
 				}
 			} else {
 				_audioscrobblerTimer = nil;
@@ -605,11 +606,12 @@ static MainController *sharedController;
 		
 		if ([df boolForKey:@"audioscrobblerEnabled"]) {
 			int length = [[self currentRemote] currentSongDuration];
-			if (_audioscrobblerTimer) {
-				[_audioscrobblerTimer invalidate];
-			}
 			if (length > 30) {
-				_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+				_audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+				[_audioscrobblerTimer invalidate];
+				[_audioscrobblerTimer release];
+				_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+				[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
 			}
 		} else {
 			_audioscrobblerTimer = nil;
@@ -627,15 +629,14 @@ static MainController *sharedController;
 
 - (void)submitAudioscrobblerTrack:(NSTimer *)timer
 {
-	int interval = [timer timeInterval];
-	[timer invalidate];
-	_audioscrobblerTimer = nil;
 	ITDebugLog(@"Audioscrobbler: Attempting to submit current track");
+	[timer invalidate];
 	if ([df boolForKey:@"audioscrobblerEnabled"]) {
 		NS_DURING
-			int elapsed = [[self currentRemote] currentSongPlayed];
-			if ((abs(elapsed - interval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
+			int elapsed = [[self currentRemote] currentSongPlayed], length = [[self currentRemote] currentSongDuration], requiredInterval = ((length / 2 < 240) ? length / 2 : 240);
+			if ((abs(elapsed - requiredInterval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
 				NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+				NSLog(@"Audioscrobbler: Submitting");
 				if (title && artist) {
 					ITDebugLog(@"Audioscrobbler: Submitting current track");
 					[[AudioscrobblerController sharedController] submitTrack:title
@@ -643,9 +644,15 @@ static MainController *sharedController;
 																	album:[[self currentRemote] currentSongAlbum]
 																	length:[[self currentRemote] currentSongDuration]];
 				}
-			} else if (interval - elapsed > 0) {
-				ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", interval - elapsed);
-				_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:(interval - elapsed) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+			} else if (requiredInterval - elapsed > 0) {
+				_audioscrobblerInterval = requiredInterval - elapsed;
+				[_audioscrobblerTimer release];
+				NSLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+				ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+				_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+				[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+			} else {
+				NSLog(@"Audioscrobbler: Skipping submission. %i, %i", requiredInterval, elapsed);
 			}
 		NS_HANDLER
 			[self networkError:localException];
@@ -976,6 +983,16 @@ static MainController *sharedController;
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
+	if ([df objectForKey:@"AlbumArt"] != nil) {
+        ITDebugLog(@"Setting up album art hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"AlbumArt"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"AlbumArt"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(showCurrentAlbumArtHotKey)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+	
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
         ITDebugLog(@"Setting up upcoming songs hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -1094,6 +1111,57 @@ static MainController *sharedController;
 	[self showCurrentTrackInfo];
 }
 
+- (void)showCurrentAlbumArtHotKey
+{
+	//If we're already visible and the setting says so, vanish instead of displaying again.
+	if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowAlbumArtType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+		ITDebugLog(@"Art window is already visible, hiding track window.");
+		[[StatusWindow sharedWindow] vanish:nil];
+		return;
+	}
+	[self showCurrentAlbumArt];
+}
+
+- (void)showCurrentAlbumArt
+{
+	NSImage *art = nil;
+	NS_DURING
+		art = [[self currentRemote] currentSongAlbumArt];
+	NS_HANDLER
+		[self networkError:localException];
+	NS_ENDHANDLER
+	
+	if (art) {
+		NSSize oldSize = [art size], newSize;
+		if (oldSize.width > 300 && oldSize.height > 300) {
+			if (oldSize.width > oldSize.height) {
+				newSize = NSMakeSize(300, oldSize.height * (300.0f / oldSize.width));
+			} else {
+				newSize = NSMakeSize(oldSize.width * (300.0f / oldSize.height), 300);
+			}
+		} else {
+			newSize = oldSize;
+		}
+		
+		art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+		
+		[statusWindowController showAlbumArtWindowWithImage:art];
+	} else {
+		NSString *string = nil;
+		NS_DURING
+			if ([[self currentRemote] currentSongTitle]) {
+				string = NSLocalizedString(@"noAlbumArt", @"No art for current song.");
+			} else {
+				string = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
+			}
+		NS_HANDLER
+			[self networkError:localException];
+		NS_ENDHANDLER
+		//Show the no song playing window if there is no album art or no track is playing
+		[statusWindowController showAlbumArtWindowWithErrorText:string];
+	}
+}
+
 - (void)showCurrentTrackInfo
 {
     ITMTRemotePlayerSource  source      = 0;
@@ -1228,7 +1296,7 @@ static MainController *sharedController;
 {
 	StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
 	_timeUpdateCount++;
-	if ([sw visibilityState] != ITWindowHiddenState) {
+	if ([statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [sw visibilityState] != ITWindowHiddenState) {
 		NSString *time = nil, *length;
 		NS_DURING
 			length = [[self currentRemote] currentSongLength];