X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6f3e95b38759c72706e83ff140ae17667cdfad22..95bfc9d0fa830da8615ed00808ff347df2f50eb5:/MainController.m

diff --git a/MainController.m b/MainController.m
index cfc9518..db0269f 100755
--- a/MainController.m
+++ b/MainController.m
@@ -9,6 +9,7 @@
 #import <ITKit/ITCategory-NSMenu.h>
 #import "StatusWindow.h"
 #import "StatusWindowController.h"
+#import "AudioscrobblerController.h"
 #import "StatusItemHack.h"
 
 @interface NSMenu (MenuImpl)
@@ -88,6 +89,7 @@ static MainController *sharedController;
         sharedController = self;
         
 		_statusWindowUpdateTimer = nil;
+		_audioscrobblerTimer = nil;
 		
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         [[PreferencesController sharedPrefs] setController:self];
@@ -461,6 +463,18 @@ static MainController *sharedController;
 					[statusItem setToolTip:nil];
 				}
 			}
+			
+			if ([df boolForKey:@"audioscrobblerEnabled"]) {
+				int length = [[self currentRemote] currentSongDuration];
+				if (_audioscrobblerTimer) {
+					[_audioscrobblerTimer invalidate];
+				}
+				if (length > 0) {
+					_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+				}
+			} else {
+				_audioscrobblerTimer = nil;
+			}
         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER
@@ -575,6 +589,18 @@ static MainController *sharedController;
 				[statusItem setToolTip:nil];
 			}
 		}
+		
+		if ([df boolForKey:@"audioscrobblerEnabled"]) {
+			int length = [[self currentRemote] currentSongDuration];
+			if (_audioscrobblerTimer) {
+				[_audioscrobblerTimer invalidate];
+			}
+			if (length > 0) {
+				_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+			}
+		} else {
+			_audioscrobblerTimer = nil;
+		}
 	NS_HANDLER
 		[self networkError:localException];
 	NS_ENDHANDLER
@@ -586,6 +612,25 @@ static MainController *sharedController;
     }
 }
 
+- (void)submitAudioscrobblerTrack:(NSTimer *)timer
+{
+	if ([df boolForKey:@"audioscrobblerEnabled"]) {
+		NS_DURING
+			NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+			if (title && artist) {
+				[[AudioscrobblerController sharedController] submitTrack:title
+																artist:artist
+																album:[[self currentRemote] currentSongAlbum]
+																length:[[self currentRemote] currentSongDuration]];
+			}
+		NS_HANDLER
+			[self networkError:localException];
+		NS_ENDHANDLER
+		[timer invalidate];
+		_audioscrobblerTimer = nil;
+	}
+}
+
 //
 //
 // Menu Selectors
@@ -905,7 +950,7 @@ static MainController *sharedController;
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
         [hotKey setTarget:self];
-        [hotKey setAction:@selector(showCurrentTrackInfo)];
+        [hotKey setAction:@selector(showCurrentTrackInfoHotKey)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
@@ -1015,6 +1060,18 @@ static MainController *sharedController;
     ITDebugLog(@"Finished setting up hot keys.");
 }
 
+- (void)showCurrentTrackInfoHotKey
+{
+	//If we're already visible and the setting says so, vanish instead of displaying again.
+	if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+		ITDebugLog(@"Track window is already visible, hiding track window.");
+		[self invalidateStatusWindowUpdateTimer];
+		[[StatusWindow sharedWindow] vanish:nil];
+		return;
+	}
+	[self showCurrentTrackInfo];
+}
+
 - (void)showCurrentTrackInfo
 {
     ITMTRemotePlayerSource  source      = 0;
@@ -1039,16 +1096,18 @@ static MainController *sharedController;
     
     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
+			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"] ) {
@@ -1329,9 +1388,11 @@ static MainController *sharedController;
 
 - (void)setRating:(ITHotKey *)sender
 {
-    int stars = [[sender name] characterAtIndex:9] - 48;
-    [self selectSongRating:stars * 20];
-    [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+	if ([self songIsPlaying]) {
+		int stars = [[sender name] characterAtIndex:9] - 48;
+		[self selectSongRating:stars * 20];
+		[statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+	}
 }
 
 - (void)toggleLoop