X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/e998c75c99ca100fabb104ea6a8d863278227df4..dd401fbf4c409df6e0a9c291fefca06bcfd87d31:/MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 4b8ac85..eea31d2 100755
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -44,14 +44,13 @@
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     
-    if ( ( [currentRemote playerRunningStatus] == ITMTRemotePlayerRunning ) ) {
+    if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
         [self remotePlayerLaunched:nil];
     } else {
         [self remotePlayerTerminated:nil];
     }
     
-    statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar]
-                                              withLength:NSSquareStatusItemLength];
+    statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength];
     
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
@@ -201,6 +200,7 @@
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;
+    songRatingMenuItem = nil;
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
@@ -280,35 +280,31 @@
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {
-            /*NSMenu *ratingSubmenu = [[NSMenu alloc] initWithTitle:@""];
-            unichar whiteStarChar = 2606;
-            unichar blackStarChar = 2605;
-            NSString *whiteStar = [NSString stringWithCharacters:&whiteStarChar
-                                            length:1];
-            NSString *blackStar = [NSString stringWithCharacters:&blackStarChar
-                                            length:1];
-            NSData *whiteStarData = [whiteStar dataUsingEncoding:NSUTF8StringEncoding];
-            NSData *blackStarData = [blackStar dataUsingEncoding:NSUTF8StringEncoding];
-            NSString *string = @"";
+            NSMenuItem *item;
             int i;
+            NSString *curTitle = @".....";
             
-            whiteStar = [[NSString alloc] initWithData:whiteStarData encoding:NSUTF8StringEncoding];
+            songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"
+                    action:nil
+                    keyEquivalent:@""];
             
-            for (i = 0; i < 5; i++) {
-                string = [string stringByAppendingString:whiteStar];
-            }
-            for (i = 0; i < 6; i++) {
-                NSMenuItem *ratingItem;
-                ratingItem = [ratingSubmenu addItemWithTitle:string action:@selector(setSongRating:) keyEquivalent:@""];
-                [ratingItem setTarget:self];
-                [ratingItem setTag:i * 20];
-                string = [string substringToIndex:4];
-                string = [blackStar stringByAppendingString:string];
+            ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+            
+            item = [ratingMenu addItemWithTitle:@"....."
+                            action:@selector(setSongRating:)
+                            keyEquivalent:@""];
+            [item setTarget:self];
+            [item setTag:0];
+            
+            for (i = 1; i < 6; i++) {
+                curTitle = [curTitle substringToIndex:4];
+                curTitle = [@"x" stringByAppendingString:curTitle];
+                item = [ratingMenu addItemWithTitle:curTitle
+                            action:@selector(setSongRating:)
+                            keyEquivalent:@""];
+                [item setTarget:self];
+                [item setTag:(i * 20)];
             }
-            [ratingSubmenu autorelease];*/
-            [[menu addItemWithTitle:@"Song Rating"
-                    action:nil
-                    keyEquivalent:@""] setSubmenu:ratingMenu];
         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
@@ -394,6 +390,16 @@
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
+                
+                if (songRatingMenuItem) {
+                    int rating = (int)[currentRemote currentSongRating] * 10;
+                    int i;
+                    for (i = 0; i < 5; i++) {
+                        [[ratingMenu itemAtIndex:i] setState:NSOffState];
+                        [[ratingMenu itemAtIndex:i] setTarget:self];
+                    }
+                    [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState];
+                }
             }
             
             if ([defaults boolForKey:@"showName"]) {
@@ -409,6 +415,9 @@
                 [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
                 [menu insertItem:menuItem atIndex:trackInfoIndex];
                 [menuItem release];
+                
+                [songRatingMenuItem setSubmenu:ratingMenu];
+                [songRatingMenuItem setEnabled:YES];
             }
         } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
             [menu removeItemAtIndex:trackInfoIndex];
@@ -442,6 +451,7 @@
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }
+    [menu update];
 }
 
 //Rebuild the upcoming songs submenu. Can be improved a lot.
@@ -525,9 +535,14 @@
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
-    enabledItem = [eqMenu addItemWithTitle:@"EQ Enabled"
-                          action:NULL
+    enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+                          action:@selector(toggleEqualizer)
                           keyEquivalent:@""];
+    
+    if ([currentRemote equalizerEnabled] == NO) {
+        [enabledItem setState:NSOnState];
+    }
+    
     [eqMenu addItem:[NSMenuItem separatorItem]];
     
     for (i = 0; i < [eqPresets count]; i++) {
@@ -594,14 +609,14 @@
 - (void)timerUpdate
 {
     int playlist = [currentRemote currentPlaylistIndex];
-    ITMTRemotePlayerState playerState = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
     
-    if ((playlist > 0) || playerState != ITMTRemotePlayerStopped) {
+    if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {
         int trackPlayingIndex = [currentRemote currentSongIndex];
         
         if (trackPlayingIndex != lastSongIndex) {
             BOOL wasPlayingRadio = isPlayingRadio;
-            isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+            isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
             
             if (isPlayingRadio && !wasPlayingRadio) {
                 int i;
@@ -624,7 +639,7 @@
         } else {
             if (playlist != lastPlaylistIndex) {
                 BOOL wasPlayingRadio = isPlayingRadio;
-                isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+                isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
                 
                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;
@@ -655,7 +670,7 @@
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){
-            if (playerState == ITMTRemotePlayerPlaying) {
+            if (playerPlayingState == ITMTRemotePlayerPlaying) {
                 [playPauseMenuItem setTitle:@"Pause"];
             } else {
                 [playPauseMenuItem setTitle:@"Play"];
@@ -693,6 +708,9 @@
         [upcomingSongsItem setSubmenu:nil];
         [upcomingSongsItem setEnabled:NO];
         
+        [songRatingMenuItem setSubmenu:nil];
+        [songRatingMenuItem setEnabled:NO];
+        
         menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
         [menu insertItem:menuItem atIndex:trackInfoIndex];
         [menuItem release];
@@ -720,7 +738,7 @@
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
-    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
     [runLoop run];
     [pool release];
 }
@@ -755,7 +773,6 @@
 - (void)playTrack:(id)sender
 {
     [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
-    [self updateMenu];
 }
 
 - (void)selectPlaylist:(id)sender
@@ -777,13 +794,13 @@
     int curSet = [currentRemote currentEQPresetIndex];
     int item = [[sender representedObject] intValue];
     [currentRemote switchToEQAtIndex:item];
-    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
-    [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+    [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
 }
 
 - (void)playPause:(id)sender
 {
-    ITMTRemotePlayerState state = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
     
     if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
@@ -819,8 +836,14 @@
     [playPauseMenuItem setTitle:@"Play"];
 }
 
-- (IBAction)setSongRating:(id)sender
+- (void)toggleEqualizer
+{
+    [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (void)setSongRating:(id)sender
 {
+    NSLog(@"%f", [currentRemote currentSongRating]);
     NSLog(@"%f", (float)[sender tag] / 100.0);
     [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
 }