w00t. If player application is not running, instead of simply saying so,

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 2f3b083..0c08e20 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -44,14 +44,13 @@
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     

-    if ([currentRemote isAppRunning]) {
+    if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {

         [self remotePlayerLaunched:nil];
     } else {
         [self remotePlayerTerminated:nil];
     }
     
         [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"]];
     
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];


@@ -201,6 +200,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 +280,31 @@
                     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 = @"";
+            NSMenuItem *item;

             int i;
             int i;

+            NSString *curTitle = @".....";

             
             

-            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:@""];
+            
+            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)];
+            }

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


@@ -322,7 +322,7 @@
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     

-    if (!isAppRunning) {
+    if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {

         return;
     }
     
         return;
     }
     


@@ -337,7 +337,6 @@
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }

-    

     if (trackInfoIndex > -1) {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [currentRemote currentSongTitle];
     if (trackInfoIndex > -1) {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [currentRemote currentSongTitle];


@@ -391,6 +390,16 @@
                     [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];
+                        [[ratingMenu itemAtIndex:i] setTarget:self];
+                    }
+                    [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState];
+                }

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


@@ -406,6 +415,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];


@@ -439,6 +451,7 @@
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }

+    [menu update];

 }
 
 //Rebuild the upcoming songs submenu. Can be improved a lot.
 }
 
 //Rebuild the upcoming songs submenu. Can be improved a lot.


@@ -522,9 +535,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++) {


@@ -591,14 +609,14 @@
 - (void)timerUpdate
 {
     int playlist = [currentRemote currentPlaylistIndex];
 - (void)timerUpdate
 {
     int playlist = [currentRemote currentPlaylistIndex];

-    ITMTRemotePlayerState playerState = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];

     
     

-    if ((playlist > 0) || playerState != stopped) {
+    if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {

         int trackPlayingIndex = [currentRemote currentSongIndex];
         
         if (trackPlayingIndex != lastSongIndex) {
             BOOL wasPlayingRadio = isPlayingRadio;
         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;
             
             if (isPlayingRadio && !wasPlayingRadio) {
                 int i;


@@ -621,7 +639,7 @@
         } else {
             if (playlist != lastPlaylistIndex) {
                 BOOL wasPlayingRadio = isPlayingRadio;
         } 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;
                 
                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;


@@ -652,7 +670,7 @@
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){

-            if (playerState == playing) {
+            if (playerPlayingState == ITMTRemotePlayerPlaying) {

                 [playPauseMenuItem setTitle:@"Pause"];
             } else {
                 [playPauseMenuItem setTitle:@"Play"];
                 [playPauseMenuItem setTitle:@"Pause"];
             } else {
                 [playPauseMenuItem setTitle:@"Play"];


@@ -690,6 +708,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];


@@ -698,10 +719,10 @@
 
 - (void)remotePlayerLaunched:(NSNotification *)note
 {
 
 - (void)remotePlayerLaunched:(NSNotification *)note
 {

-    isAppRunning = YES;
+    isAppRunning = ITMTRemotePlayerRunning;

     
     //Restart the timer
     
     //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) {
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     if (playlistItem) {


@@ -713,20 +734,29 @@
     [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.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+    [runLoop run];
+    [pool release];
+}
+

 - (void)remotePlayerTerminated:(NSNotification *)note
 {
 - (void)remotePlayerTerminated:(NSNotification *)note
 {

-    isAppRunning = NO;
+    isAppRunning = ITMTRemotePlayerNotRunning;

     
     [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];
     
     [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];

-    [menu addItemWithTitle:@"Audio Player" action:NULL keyEquivalent:@""];
-    [menu addItemWithTitle:@"Not Running" action:NULL keyEquivalent:@""];
+    [[menu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self];

     [menu addItem:[NSMenuItem separatorItem]];
     [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
     [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];
     [menu addItem:[NSMenuItem separatorItem]];
     [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
     [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];

+    [refreshTimer release];

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


@@ -742,7 +772,6 @@
 - (void)playTrack:(id)sender
 {
     [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
 - (void)playTrack:(id)sender
 {
     [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];

-    [self updateMenu];

 }
 
 - (void)selectPlaylist:(id)sender
 }
 
 - (void)selectPlaylist:(id)sender


@@ -764,18 +793,18 @@
     int curSet = [currentRemote currentEQPresetIndex];
     int item = [[sender representedObject] intValue];
     [currentRemote switchToEQAtIndex:item];
     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
 {
 }
 
 - (void)playPause:(id)sender
 {

-    ITMTRemotePlayerState state = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];

     
     

-    if (state == playing) {
+    if (state == ITMTRemotePlayerPlaying) {

         [currentRemote pause];
         [playPauseMenuItem setTitle:@"Play"];
         [currentRemote pause];
         [playPauseMenuItem setTitle:@"Play"];

-    } else if ((state == forwarding) || (state == rewinding)) {
+    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {

         [currentRemote pause];
         [currentRemote play];
     } else {
         [currentRemote pause];
         [currentRemote play];
     } else {


@@ -796,7 +825,7 @@
 
 - (void)fastForward:(id)sender
 {
 
 - (void)fastForward:(id)sender
 {

-    [currentRemote fastForward];
+    [currentRemote forward];

     [playPauseMenuItem setTitle:@"Play"];
 }
 
     [playPauseMenuItem setTitle:@"Play"];
 }
 


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

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

 - (void)setSongRating:(id)sender
 {
 - (void)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];
 }


@@ -832,13 +867,25 @@
 
 - (void)closePreferences
 {
 
 - (void)closePreferences
 {

-    if (isAppRunning) {
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {

         [self setupHotKeys];
     }
     [prefsController release];
     prefsController = nil;
 }
 
         [self setupHotKeys];
     }
     [prefsController release];
     prefsController = nil;
 }
 

+- (void)showPlayer:(id)sender
+{
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
+        [currentRemote showPrimaryInterface];
+    } else {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
+            NSLog(@"Error Launching Player");
+        }
+    }
+}
+        
+

 //
 //
 // Show Current Track Info And Show Upcoming Songs Floaters
 //
 //
 // Show Current Track Info And Show Upcoming Songs Floaters


@@ -1129,6 +1176,7 @@
 {
     if (refreshTimer) {
         [refreshTimer invalidate];
 {
     if (refreshTimer) {
         [refreshTimer invalidate];

+        [refreshTimer release];

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