The stars in the rating menu show up now.

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 9115c10..4b8ac85 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -44,7 +44,7 @@
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     
-    if ( ( [currentRemote remotePlayerStatus] == ITMTRemotePlayerRunning ) ) {
+    if ( ( [currentRemote playerRunningStatus] == ITMTRemotePlayerRunning ) ) {
         [self remotePlayerLaunched:nil];
     } else {
         [self remotePlayerTerminated:nil];
@@ -280,18 +280,22 @@
                     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
+            /*NSMenu *ratingSubmenu = [[NSMenu alloc] initWithTitle:@""];
+            unichar whiteStarChar = 2606;
+            unichar blackStarChar = 2605;
+            NSString *whiteStar = [NSString stringWithCharacters:&whiteStarChar
                                             length:1];
-            NSString *blackStarString = [NSString stringWithCharacters:&blackStar
+            NSString *blackStar = [NSString stringWithCharacters:&blackStarChar
                                             length:1];
+            NSData *whiteStarData = [whiteStar dataUsingEncoding:NSUTF8StringEncoding];
+            NSData *blackStarData = [blackStar dataUsingEncoding:NSUTF8StringEncoding];
             NSString *string = @"";
             int i;
             
+            whiteStar = [[NSString alloc] initWithData:whiteStarData encoding:NSUTF8StringEncoding];
+            
             for (i = 0; i < 5; i++) {
-                string = [string stringByAppendingString:whiteStarString];
+                string = [string stringByAppendingString:whiteStar];
             }
             for (i = 0; i < 6; i++) {
                 NSMenuItem *ratingItem;
@@ -299,12 +303,12 @@
                 [ratingItem setTarget:self];
                 [ratingItem setTag:i * 20];
                 string = [string substringToIndex:4];
-                string = [blackStarString stringByAppendingString:string];
+                string = [blackStar stringByAppendingString:string];
             }
+            [ratingSubmenu autorelease];*/
             [[menu addItemWithTitle:@"Song Rating"
                     action:nil
-                    keyEquivalent:@""] setSubmenu:ratingSubmenu];
-            [ratingSubmenu autorelease];
+                    keyEquivalent:@""] setSubmenu:ratingMenu];
         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
@@ -322,7 +326,7 @@
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
-    if ( ( isAppRunning = ITMTRemotePlayerNotRunning ) ) {
+    if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {
         return;
     }
     
@@ -337,7 +341,6 @@
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }
-    
     if (trackInfoIndex > -1) {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [currentRemote currentSongTitle];
@@ -593,7 +596,7 @@
     int playlist = [currentRemote currentPlaylistIndex];
     ITMTRemotePlayerState playerState = [currentRemote playerState];
     
-    if ((playlist > 0) || playerState != stopped) {
+    if ((playlist > 0) || playerState != ITMTRemotePlayerStopped) {
         int trackPlayingIndex = [currentRemote currentSongIndex];
         
         if (trackPlayingIndex != lastSongIndex) {
@@ -652,7 +655,7 @@
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){
-            if (playerState == playing) {
+            if (playerState == ITMTRemotePlayerPlaying) {
                 [playPauseMenuItem setTitle:@"Pause"];
             } else {
                 [playPauseMenuItem setTitle:@"Play"];
@@ -701,7 +704,7 @@
     isAppRunning = ITMTRemotePlayerRunning;
     
     //Restart the timer
-    refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 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) {
@@ -713,6 +716,15 @@
     [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;
@@ -727,6 +739,7 @@
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];
+    [refreshTimer release];
     refreshTimer = nil;
     [self clearHotKeys];
 }
@@ -772,10 +785,10 @@
 {
     ITMTRemotePlayerState state = [currentRemote playerState];
     
-    if (state == playing) {
+    if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
         [playPauseMenuItem setTitle:@"Play"];
-    } else if ((state == forwarding) || (state == rewinding)) {
+    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
         [currentRemote pause];
         [currentRemote play];
     } else {
@@ -796,7 +809,7 @@
 
 - (void)fastForward:(id)sender
 {
-    [currentRemote fastForward];
+    [currentRemote forward];
     [playPauseMenuItem setTitle:@"Play"];
 }
 
@@ -806,7 +819,7 @@
     [playPauseMenuItem setTitle:@"Play"];
 }
 
-- (void)setSongRating:(id)sender
+- (IBAction)setSongRating:(id)sender
 {
     NSLog(@"%f", (float)[sender tag] / 100.0);
     [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
@@ -1129,6 +1142,7 @@
 {
     if (refreshTimer) {
         [refreshTimer invalidate];
+        [refreshTimer release];
         refreshTimer = nil;
     }
     [currentRemote halt];