Added the current track info to the menu. Yay.

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 727428c..f4a66cd 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -1,18 +1,11 @@
 /*
 Things to do:
 /*
 Things to do:

-¥ Radio mode makes things act oddly

 ¥ Make preferences window pretty
 ¥ Make preferences window pretty

-¥ Hot Keys
-    - hot keys can't be set when NSBGOnly is on. The window is not key,
-      so the KeyBroadcaster does not pick up key combos
-    - going to need a different way of defining key combos

 ¥ Optimize
 ¥ Apple Events! Apple Events! Apple Events!
 ¥ Optimize
 ¥ Apple Events! Apple Events! Apple Events!

-¥ Upcoming songs menu items are disabled after launching iTunes and playing

 */
 
 #import "MenuTunes.h"
 */
 
 #import "MenuTunes.h"

-// #import "MenuTunesView.h"

 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"


@@ -71,9 +64,9 @@ Things to do:
     [[statusItem _button] setAlternateImage:[NSImage imageNamed:@"selected_image"]];
     [statusItem setHighlightMode:YES];
     [statusItem setMenu:menu];
     [[statusItem _button] setAlternateImage:[NSImage imageNamed:@"selected_image"]];
     [statusItem setHighlightMode:YES];
     [statusItem setMenu:menu];

+    // Below line of code is for creating builds for Beta Testers
+    // [statusItem setToolTip:@"This Nontransferable Beta (Built on __DATE__) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com)."];

     [statusItem retain];
     [statusItem retain];

-//  view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]];
-//  [statusItem setView:view];

 }
 
 
 }
 
 


@@ -84,8 +77,9 @@ Things to do:
 
 - (void)registerDefaultsIfNeeded
 {
 
 - (void)registerDefaultsIfNeeded
 {

-    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) {
-        [[NSUserDefaults standardUserDefaults] setObject:
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if (![defaults objectForKey:@"menu"]) {
+        [defaults setObject:

             [NSArray arrayWithObjects:
                 @"Play/Pause",
                 @"Next Track",
             [NSArray arrayWithObjects:
                 @"Play/Pause",
                 @"Next Track",


@@ -102,6 +96,26 @@ Things to do:
                 @"Current Track Info",
                 nil] forKey:@"menu"];
     }
                 @"Current Track Info",
                 nil] forKey:@"menu"];
     }

+    
+    if (![defaults objectForKey:@"showName"])
+    {
+        [defaults setBool:YES forKey:@"showName"];
+    }
+    
+    if (![defaults objectForKey:@"showArtist"])
+    {
+        [defaults setBool:YES forKey:@"showArtist"];
+    }
+    
+    if (![defaults objectForKey:@"showAlbum"])
+    {
+        [defaults setBool:NO forKey:@"showAlbum"];
+    }
+    
+    if (![defaults objectForKey:@"showTime"])
+    {
+        [defaults setBool:NO forKey:@"showTime"];
+    }

 }
 
 //Recreate the status item menu
 }
 
 //Recreate the status item menu


@@ -112,7 +126,9 @@ Things to do:
     
     trackInfoIndex = -1;
     didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
     
     trackInfoIndex = -1;
     didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);

-
+    didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0);
+    
+    

     while ([menu numberOfItems] > 0) {
         [menu removeItemAtIndex:0];
     }
     while ([menu numberOfItems] > 0) {
         [menu removeItemAtIndex:0];
     }


@@ -189,17 +205,13 @@ Things to do:
 //Updates the menu with current player state, song, and upcoming songs
 - (void)updateMenu
 {
 //Updates the menu with current player state, song, and upcoming songs
 - (void)updateMenu
 {

-    NSString *curSongName, *curAlbumName;

     NSMenuItem *menuItem;
     NSMenuItem *menuItem;

+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

     
     if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
         return;
     }
     
     
     if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
         return;
     }
     

-    //Get the current track name and album.
-    curSongName = [self runScriptAndReturnResult:@"return name of current track"];
-    curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
-    

     if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
     }
     if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
     }


@@ -210,52 +222,106 @@ Things to do:
         [self rebuildEQPresetsMenu];
     }
     
         [self rebuildEQPresetsMenu];
     }
     

-    if ([curSongName length] > 0) {
-        int index = [menu indexOfItemWithTitle:@"Now Playing"];
+    if (trackInfoIndex > -1)
+    {
+        NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
+        curSongName = [self runScriptAndReturnResult:@"return name of current track"];

         
         

-        if (index > -1) {
-            [menu removeItemAtIndex:index + 1];
-            
-            if (didHaveAlbumName) {
-                [menu removeItemAtIndex:index + 1];
-            }
+        if ([defaults boolForKey:@"showArtist"]) {
+            curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];

         }
         
         }
         

-        if ([curAlbumName length] > 0) {
-            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
-                                                  action:nil
-                                                  keyEquivalent:@""];
-            [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
-            [menuItem release];
+        if ([defaults boolForKey:@"showAlbum"]) {
+            curArtistName = [self runScriptAndReturnResult:@"return artist of current track"];

         }
         
         }
         

-        menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
-                                              action:nil
-                                              keyEquivalent:@""];
-        [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
-        [menuItem release];
-        
-        if (index == -1) {
-            menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
-            [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
-            [menu insertItem:menuItem atIndex:trackInfoIndex];
+        if ([curSongName length] > 0) {
+            int index = [menu indexOfItemWithTitle:@"Now Playing"];
+            
+            if (index > -1) {
+                if ([defaults boolForKey:@"showName"]) {
+                    [menu removeItemAtIndex:index + 1];
+                }
+                if (didHaveAlbumName) {
+                    [menu removeItemAtIndex:index + 1];
+                }
+                if (didHaveArtistName) {
+                    [menu removeItemAtIndex:index + 1];
+                }
+                if ([defaults boolForKey:@"showTime"]) {
+                    [menu removeItemAtIndex:index + 1];
+                }
+            }
+            if (!isPlayingRadio) {
+                if ([defaults boolForKey:@"showTime"]) {
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
+                                                        action:nil
+                                                        keyEquivalent:@""];
+                    [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
+                    [menuItem release];
+                }
+                
+                if ([curArtistName length] > 0) {
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curArtistName]
+                                                        action:nil
+                                                        keyEquivalent:@""];
+                    [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
+                    [menuItem release];
+                }
+                
+                if ([curAlbumName length] > 0) {
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
+                                                        action:nil
+                                                        keyEquivalent:@""];
+                    [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
+                    [menuItem release];
+                }
+            }
+            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
+                                                action:nil
+                                                keyEquivalent:@""];
+            [menu insertItem:menuItem atIndex:trackInfoIndex + 1];

             [menuItem release];
             [menuItem release];

-        }
-        
-    } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
-        [menu removeItemAtIndex:trackInfoIndex];
-        [menu removeItemAtIndex:trackInfoIndex];
-        
-        if (didHaveAlbumName) {
+            
+            if (index == -1) {
+                menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
+                [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
+                [menu insertItem:menuItem atIndex:trackInfoIndex];
+                [menuItem release];
+            }
+            
+        } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {

             [menu removeItemAtIndex:trackInfoIndex];
             [menu removeItemAtIndex:trackInfoIndex];

+            
+            if ([defaults boolForKey:@"showName"] == YES) {
+                [menu removeItemAtIndex:trackInfoIndex];
+            }
+            
+            if ([defaults boolForKey:@"showTime"] == YES) {
+                [menu removeItemAtIndex:trackInfoIndex];
+            }
+            
+            if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
+                [menu removeItemAtIndex:trackInfoIndex];
+            }
+            
+            if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
+                [menu removeItemAtIndex:trackInfoIndex];
+            }
+            
+            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];
+        if ([defaults boolForKey:@"showArtist"]) {
+                didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
+            }
+            
+            if ([defaults boolForKey:@"showAlbum"]) {
+                didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);
+            }

     }
     }

-    
-    didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);

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


@@ -263,30 +329,33 @@ Things to do:
 {
     int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
 {
     int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];

-    
-    if (numSongs > 0) {
-        int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
-        int i;
-        
-        [upcomingSongsMenu release];
-        upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
-        
-        for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
-            if (i <= numSongs) {
-                NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]];
-                NSMenuItem *songItem;
-                songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
-                [songItem setTarget:self];
-                [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
-                [upcomingSongsMenu addItem:songItem];
-                [songItem release];
-            } else {
-                [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:nil keyEquivalent:@""];
-                break;
+    if (!isPlayingRadio) {
+        if (numSongs > 0) {
+            int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+            int i;
+            
+            [upcomingSongsMenu release];
+            upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+            [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+            [upcomingSongsItem setEnabled:YES];
+            
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+                if (i <= numSongs) {
+                    NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]];
+                    NSMenuItem *songItem;
+                    songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
+                    [songItem setTarget:self];
+                    [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
+                    [upcomingSongsMenu addItem:songItem];
+                    [songItem release];
+                } else {
+                    break;
+                }

             }
         }
             }
         }

-        [upcomingSongsItem setSubmenu:upcomingSongsMenu];
-        [upcomingSongsItem setEnabled:YES];
+    } else {
+        [upcomingSongsItem setSubmenu:nil];
+        [upcomingSongsItem setEnabled:NO];

     }
 }
 
     }
 }
 


@@ -295,6 +364,11 @@ Things to do:
     int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue];
     int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
     
     int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue];
     int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
     

+    if (isPlayingRadio)
+    {
+        curPlaylist = 0;
+    }
+    

     if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems]))
         return;
     
     if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems]))
         return;
     


@@ -423,15 +497,50 @@ Things to do:
 - (void)timerUpdate
 {
     int pid;
 - (void)timerUpdate
 {
     int pid;

-    

     if (GetProcessPID(&iTunesPSN, &pid) == noErr) {
         int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
         
         if (trackPlayingIndex != curTrackIndex) {
     if (GetProcessPID(&iTunesPSN, &pid) == noErr) {
         int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
         
         if (trackPlayingIndex != curTrackIndex) {

+            bool wasPlayingRadio = isPlayingRadio;
+            isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+            if (isPlayingRadio && !wasPlayingRadio) {
+                int i;
+                for (i = 0; i < [playlistMenu numberOfItems]; i++)
+                {
+                    [[playlistMenu itemAtIndex:i] setState:NSOffState];
+                }
+            }
+            if (wasPlayingRadio) {
+                NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
+                [menu insertItem:temp atIndex:trackInfoIndex + 1];
+                [temp release];
+            }

             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }
             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }

-               
+        else
+        {
+            int playlist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+            if (playlist != curPlaylistIndex) {
+                bool wasPlayingRadio = isPlayingRadio;
+                isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+                if (isPlayingRadio && !wasPlayingRadio) {
+                    int i;
+                    for (i = 0; i < [playlistMenu numberOfItems]; i++)
+                    {
+                        [[playlistMenu itemAtIndex:i] setState:NSOffState];
+                    }
+                }
+                if (wasPlayingRadio) {
+                    NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
+                    [menu insertItem:temp atIndex:trackInfoIndex + 1];
+                    [temp release];
+                }
+                [self updateMenu];
+                curTrackIndex = trackPlayingIndex;
+                curPlaylistIndex = playlist;
+            }
+        }

         //Update Play/Pause menu item
         if (playPauseMenuItem){
             if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
         //Update Play/Pause menu item
         if (playPauseMenuItem){
             if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {


@@ -516,9 +625,12 @@ andEventID:(AEEventID)eventID
 - (void)selectPlaylist:(id)sender
 {
     int playlist = [[sender representedObject] intValue];
 - (void)selectPlaylist:(id)sender
 {
     int playlist = [[sender representedObject] intValue];

+    if (!isPlayingRadio) {
+        int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+        [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+    }

     [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
     [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];

-    [self updateMenu];

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