Small change to album art.

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index f9e23ed..eadc1b6 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -10,6 +10,30 @@
 #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;
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;


@@ -331,6 +355,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


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

-        //[[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
-        [[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


@@ -486,7 +522,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


@@ -773,6 +814,7 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showAlbumArtwork"] ) {
              NS_DURING
                 art = [[self currentRemote] currentSongAlbumArt];
         if ( [df boolForKey:@"showAlbumArtwork"] ) {
              NS_DURING
                 art = [[self currentRemote] currentSongAlbumArt];

+                art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:NSMakeSize(110,110)];

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


@@ -781,7 +823,6 @@ static MainController *sharedController;
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }

-

     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album