Readded the stupid ratings menu to the nib, since it went poof. Added

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 77c59ba..ccb4b5a 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -201,6 +201,7 @@
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;

+    songRatingMenuItem = nil;

     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;


@@ -280,31 +281,9 @@
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {

-            NSMenu *ratingSubmenu = [[NSMenu alloc] initWithTitle:@""];
-            unichar whiteStar = 'o';//2606;
-            unichar blackStar = 'x';//2605;
-            NSString *whiteStarString = [NSString stringWithCharacters:&whiteStar
-                                            length:1];
-            NSString *blackStarString = [NSString stringWithCharacters:&blackStar
-                                            length:1];
-            NSString *string = @"";
-            int i;
-            
-            for (i = 0; i < 5; i++) {
-                string = [string stringByAppendingString:whiteStarString];
-            }
-            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 = [blackStarString stringByAppendingString:string];
-            }
-            [[menu addItemWithTitle:@"Song Rating"
+            songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"

                     action:nil
                     action:nil

-                    keyEquivalent:@""] setSubmenu:ratingSubmenu];
-            [ratingSubmenu autorelease];
+                    keyEquivalent:@""];

         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }


@@ -390,6 +369,36 @@
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
                     [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];
+                    }
+                    
+                    switch (rating) {
+                        case 0:
+                            [[ratingMenu itemAtIndex:5] setState:NSOnState];
+                        break;
+                        case 2:
+                            [[ratingMenu itemAtIndex:4] setState:NSOnState];
+                        break;
+                        case 4:
+                            [[ratingMenu itemAtIndex:3] setState:NSOnState];
+                        break;
+                        case 6:
+                            [[ratingMenu itemAtIndex:2] setState:NSOnState];
+                        break;
+                        case 8:
+                            [[ratingMenu itemAtIndex:1] setState:NSOnState];
+                        break;
+                        case 10:
+                            [[ratingMenu itemAtIndex:0] setState:NSOnState];
+                        break;
+                    }
+                }

             }
             
             if ([defaults boolForKey:@"showName"]) {
             }
             
             if ([defaults boolForKey:@"showName"]) {


@@ -405,6 +414,9 @@
                 [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
                 [menu insertItem:menuItem atIndex:trackInfoIndex];
                 [menuItem release];
                 [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];
             }
         } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
             [menu removeItemAtIndex:trackInfoIndex];


@@ -521,9 +533,14 @@
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     

-    enabledItem = [eqMenu addItemWithTitle:@"EQ Enabled"
-                          action:NULL
+    enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+                          action:@selector(toggleEqualizer)

                           keyEquivalent:@""];
                           keyEquivalent:@""];

+    
+    if ([currentRemote equalizerEnabled] == NO) {
+        [enabledItem setState:NSOnState];
+    }
+    

     [eqMenu addItem:[NSMenuItem separatorItem]];
     
     for (i = 0; i < [eqPresets count]; i++) {
     [eqMenu addItem:[NSMenuItem separatorItem]];
     
     for (i = 0; i < [eqPresets count]; i++) {


@@ -689,6 +706,9 @@
         [upcomingSongsItem setSubmenu:nil];
         [upcomingSongsItem setEnabled:NO];
         
         [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];
         menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
         [menu insertItem:menuItem atIndex:trackInfoIndex];
         [menuItem release];


@@ -700,7 +720,7 @@
     isAppRunning = ITMTRemotePlayerRunning;
     
     //Restart the timer
     isAppRunning = ITMTRemotePlayerRunning;
     
     //Restart the timer

-    refreshTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; 
+    [NSThread detachNewThreadSelector:@selector(runTimerInNewThread) toTarget:self withObject:nil];

     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     if (playlistItem) {
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     if (playlistItem) {


@@ -712,6 +732,15 @@
     [statusItem setMenu:menu]; //Set the menu back to the main one
 }
 
     [statusItem setMenu:menu]; //Set the menu back to the main one
 }
 

+- (void)runTimerInNewThread
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+    [runLoop run];
+    [pool release];
+}
+

 - (void)remotePlayerTerminated:(NSNotification *)note
 {
     isAppRunning = ITMTRemotePlayerNotRunning;
 - (void)remotePlayerTerminated:(NSNotification *)note
 {
     isAppRunning = ITMTRemotePlayerNotRunning;


@@ -726,6 +755,7 @@
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];

+    [refreshTimer release];

     refreshTimer = nil;
     [self clearHotKeys];
 }
     refreshTimer = nil;
     [self clearHotKeys];
 }


@@ -805,8 +835,14 @@
     [playPauseMenuItem setTitle:@"Play"];
 }
 
     [playPauseMenuItem setTitle:@"Play"];
 }
 

-- (void)setSongRating:(id)sender
+- (void)toggleEqualizer
+{
+    [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (IBAction)setSongRating:(id)sender

 {
 {

+    NSLog(@"%f", [currentRemote currentSongRating]);

     NSLog(@"%f", (float)[sender tag] / 100.0);
     [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
 }
     NSLog(@"%f", (float)[sender tag] / 100.0);
     [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
 }


@@ -1128,6 +1164,7 @@
 {
     if (refreshTimer) {
         [refreshTimer invalidate];
 {
     if (refreshTimer) {
         [refreshTimer invalidate];

+        [refreshTimer release];

         refreshTimer = nil;
     }
     [currentRemote halt];
         refreshTimer = nil;
     }
     [currentRemote halt];