X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/93f1f93114865d18b5870f04763c921ff33b8e59..4f2a1a6b5d25d7cbae4f356eabe754a4f6e98adb:/MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 9879f8a..6a440ea 100755
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -1,91 +1,107 @@
-//
-//  MenuTunes.m
-//
-//  iThink Software, Copyright 2002
-//
-//
-
 /*
 Things to do:
-¥ Radio mode makes things ugly
-¥ Add other options to the menu
-    - EQ sets
-    - set song rating
+¥ Radio mode makes things act oddly
 ¥ 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. Bad...
-    - the hotkey classes are ugly, I didn't write them
-¥ Optimize code
-¥ Apple Events!
+      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!
+¥ Upcoming songs menu items are disabled after launching iTunes and playing
 */
 
 #import "MenuTunes.h"
-#import "MenuTunesView.h"
+// #import "MenuTunesView.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
 
+@interface MenuTunes(Private)
+- (void)registerDefaultsIfNeeded;
+- (void)updateMenu;
+- (void)rebuildUpcomingSongsMenu;
+- (void)rebuildPlaylistMenu;
+- (void)rebuildEQPresetsMenu;
+- (void)setupHotKeys;
+- (NSString *)runScriptAndReturnResult:(NSString *)script;
+- (void)timerUpdate;
+- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
+
+@end
+
 @implementation MenuTunes
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION METHODS
+/*************************************************************************/
+
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
-    menu = [[NSMenu alloc] initWithTitle:@""];
-    
-    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"])
-    {
-        [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", @"Upcoming Songs", @"Playlists", @"<separator>", @"PreferencesÉ", @"Quit", @"<separator>", @"Current Track Info", nil] forKey:@"menu"];
-    }
+    asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
+
+    [self registerDefaultsIfNeeded];
     
+    menu = [[NSMenu alloc] initWithTitle:@""];
     iTunesPSN = [self iTunesPSN]; //Get PSN of iTunes if it's running
-    [self rebuildMenu]; //Create the status item menu
-    
-    statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
-    [statusItem setImage:[NSImage imageNamed:@"menu.tiff"]];
-    [statusItem setHighlightMode:YES];
-    [statusItem setMenu:menu];
-    [statusItem retain];
-    
-    view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]];
-    //[statusItem setView:view];
     
-    //If iTunes is running, start the timer
     if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)))
     {
-        refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 
-target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
+        [self rebuildMenu];
+        refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
+                                                        target:self
+                                                      selector:@selector(timerUpdate)
+                                                      userInfo:nil
+                                                       repeats:YES];
     }
     else
     {
-        NSMenu *menu2 = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-        
-        //Register for the workspace note
+        menu = [[NSMenu alloc] initWithTitle:@""];
+        [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
+        [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
+        [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
         [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
-        refreshTimer = NULL;
-        
-        [[menu2 addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
-        [[menu2 addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        [[menu2 addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        [statusItem setMenu:menu2];
+        refreshTimer = nil;
     }
+    
+    statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    [[[statusItem _button] cell] setType:0];
+    [statusItem setImage:[NSImage imageNamed:@"menu"]];
+    [[statusItem _button] setAlternateImage:[NSImage imageNamed:@"selected_image"]];
+    [statusItem setHighlightMode:YES];
+    [statusItem setMenu:menu];
+    [statusItem retain];
+//  view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]];
+//  [statusItem setView:view];
 }
 
-- (void)applicationWillTerminate:(NSNotification *)note
-{
-    [self clearHotKeys];
-    [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
-}
 
-- (void)dealloc
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
+- (void)registerDefaultsIfNeeded
 {
-    if (refreshTimer)
-    {
-        [refreshTimer invalidate];
+    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) {
+        [[NSUserDefaults standardUserDefaults] setObject:
+            [NSArray arrayWithObjects:
+                @"Play/Pause",
+                @"Next Track",
+                @"Previous Track",
+                @"Fast Forward",
+                @"Rewind",
+                @"<separator>",
+                @"Upcoming Songs",
+                @"Playlists",
+                @"<separator>",
+                @"PreferencesÉ",
+                @"Quit",
+                @"<separator>",
+                @"Current Track Info",
+                nil] forKey:@"menu"];
     }
-    [statusItem release];
-    [menu release];
-    [view release];
-    [super dealloc];
 }
 
 //Recreate the status item menu
@@ -93,76 +109,76 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 {
     NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
     int i;
-    trackInfoIndex = -1;
-    
-    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)))
-    {
-        didHaveAlbumName = (([[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn album of current track\nend tell"] length] > 0) ? YES : NO);
-    }
-    else
-    {
-        didHaveAlbumName = NO;
-    }
     
-    while ([menu numberOfItems] > 0)
-    {
+    trackInfoIndex = -1;
+    didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
+
+    while ([menu numberOfItems] > 0) {
         [menu removeItemAtIndex:0];
     }
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;
     playlistItem = nil;
+    [playlistMenu release];
+    playlistMenu = nil;
+    eqItem = nil;
+    [eqMenu release];
+    eqMenu = nil;
     
-    for (i = 0; i < [myMenu count]; i++)
-    {
+    for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
-        if ([item isEqualToString:@"Play/Pause"])
-        {
-            playPauseMenuItem = [menu addItemWithTitle:@"Play" action:@selector(playPause:) keyEquivalent:@""];
+        if ([item isEqualToString:@"Play/Pause"]) {
+            playPauseMenuItem = [menu addItemWithTitle:@"Play"
+                                                action:@selector(playPause:)
+                                         keyEquivalent:@""];
             [playPauseMenuItem setTarget:self];
-        }
-        else if ([item isEqualToString:@"Next Track"])
-        {
-            [[menu addItemWithTitle:@"Next Track" action:@selector(nextSong:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Previous Track"])
-        {
-            [[menu addItemWithTitle:@"Previous Track" action:@selector(prevSong:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Fast Forward"])
-        {
-            [[menu addItemWithTitle:@"Fast Forward" action:@selector(fastForward:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Rewind"])
-        {
-            [[menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Upcoming Songs"])
-        {
-            upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"Playlists"])
-        {
-            playlistItem = [menu addItemWithTitle:@"Playlists" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"PreferencesÉ"])
-        {
-            [[menu addItemWithTitle:@"PreferencesÉ" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Quit"])
-        {
-            [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Current Track Info"])
-        {
+        } else if ([item isEqualToString:@"Next Track"]) {
+            [[menu addItemWithTitle:@"Next Track"
+                             action:@selector(nextSong:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Previous Track"]) {
+            [[menu addItemWithTitle:@"Previous Track"
+                             action:@selector(prevSong:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Fast Forward"]) {
+            [[menu addItemWithTitle:@"Fast Forward"
+                             action:@selector(fastForward:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Rewind"]) {
+            [[menu addItemWithTitle:@"Rewind"
+                             action:@selector(rewind:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Upcoming Songs"]) {
+            upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
+                                                action:nil
+                                         keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Playlists"]) {
+            playlistItem = [menu addItemWithTitle:@"Playlists"
+                                           action:nil
+                                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"EQ Presets"]) {
+            eqItem = [menu addItemWithTitle:@"EQ Presets"
+                                     action:nil
+                              keyEquivalent:@""];
+        } else if ([item isEqualToString:@"PreferencesÉ"]) {
+            [[menu addItemWithTitle:@"PreferencesÉ"
+                             action:@selector(showPreferences:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Quit"]) {
+            [[menu addItemWithTitle:@"Quit"
+                             action:@selector(quitMenuTunes:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
-            [menu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"<separator>"])
-        {
+            [menu addItemWithTitle:@"No Song"
+                            action:nil
+                     keyEquivalent:@""];
+        } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
     }
+    
     curTrackIndex = -1; //Force update of everything
     [self timerUpdate]; //Updates dynamic info in the menu
     
@@ -176,65 +192,65 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     NSString *curSongName, *curAlbumName;
     NSMenuItem *menuItem;
     
-    if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))
-    {
+    if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
         return;
     }
     
     //Get the current track name and album.
-    curSongName = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn name of current track\nend tell"];
-    curAlbumName = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn album of current track\nend tell"];
+    curSongName = [self runScriptAndReturnResult:@"return name of current track"];
+    curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
     
-    if (upcomingSongsItem)
-    {
+    if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
     }
-    if (playlistItem)
-    {
+    if (playlistItem) {
         [self rebuildPlaylistMenu];
     }
+    if (eqItem) {
+        [self rebuildEQPresetsMenu];
+    }
     
-    if ([curSongName length] > 0)
-    {
+    if ([curSongName length] > 0) {
         int index = [menu indexOfItemWithTitle:@"Now Playing"];
         
-        if (index > -1)
-        {
+        if (index > -1) {
             [menu removeItemAtIndex:index + 1];
-            if (didHaveAlbumName)
-            {
+            
+            if (didHaveAlbumName) {
                 [menu removeItemAtIndex:index + 1];
             }
         }
         
-        if ([curAlbumName length] > 0)
-        {
-            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName] action:NULL keyEquivalent:@""];
+        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:NULL keyEquivalent:@""];
+        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:NULL keyEquivalent:@""];
+        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)
-    {
+        
+    } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
         [menu removeItemAtIndex:trackInfoIndex];
         [menu removeItemAtIndex:trackInfoIndex];
-        if (didHaveAlbumName)
-        {
+        
+        if (didHaveAlbumName) {
             [menu removeItemAtIndex:trackInfoIndex];
         }
-        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:NULL keyEquivalent:@""];
+        
+        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
         [menu insertItem:menuItem atIndex:trackInfoIndex];
         [menuItem release];
     }
@@ -245,50 +261,48 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 //Rebuild the upcoming songs submenu. Can be improved a lot.
 - (void)rebuildUpcomingSongsMenu
 {
-    int numSongs = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn number of tracks in current playlist\nend tell"] intValue];
+    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:@"tell application \"iTunes\"\nreturn index of current track\nend tell"] intValue];
+    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:@"tell application \"iTunes\"\nreturn name of track %i of current playlist\nend tell", i]];
+        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:NULL keyEquivalent:@""];
+            } else {
+                [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:nil keyEquivalent:@""];
                 break;
             }
         }
         [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+        [upcomingSongsItem setEnabled:YES];
     }
 }
 
 - (void)rebuildPlaylistMenu
 {
-    int numPlaylists = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn number of playlists\nend tell"] intValue];
-    int i;
+    int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue];
+    int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+    
+    if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems]))
+        return;
     
     [playlistMenu release];
     playlistMenu = [[NSMenu alloc] initWithTitle:@""];
     
-    for (i = 1; i <= numPlaylists; i++)
-    {
-        NSString *playlistName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"tell application \"iTunes\"\nreturn name of playlist %i\nend tell", i]];
+    for (i = 1; i <= numPlaylists; i++) {
+        NSString *playlistName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of playlist %i", i]];
         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
         [tempItem setTarget:self];
@@ -297,6 +311,36 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
         [tempItem release];
     }
     [playlistItem setSubmenu:playlistMenu];
+    
+    if (curPlaylist) {
+        [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
+    }
+}
+
+//Build a menu with the list of all available EQ presets
+- (void)rebuildEQPresetsMenu
+{
+    int numSets = [[self runScriptAndReturnResult:@"return number of EQ presets"] intValue];
+    int i;
+    
+    if (eqMenu && (numSets == [eqMenu numberOfItems]))
+        return;
+    
+    [eqMenu release];
+    eqMenu = [[NSMenu alloc] initWithTitle:@""];
+    
+    for (i = 1; i <= numSets; i++) {
+        NSString *setName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of EQ preset %i", i]];
+        NSMenuItem *tempItem;
+        tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
+        [tempItem setTarget:self];
+        [tempItem setRepresentedObject:[NSNumber numberWithInt:i]];
+        [eqMenu addItem:tempItem];
+        [tempItem release];
+    }
+    [eqItem setSubmenu:eqMenu];
+    
+    [[eqMenu itemAtIndex:[[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue] - 1] setState:NSOnState];
 }
 
 - (void)clearHotKeys
@@ -312,43 +356,38 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
-    if ([defaults objectForKey:@"PlayPause"] != nil)
-    {
+    if ([defaults objectForKey:@"PlayPause"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
                 combo:[defaults keyComboForKey:@"PlayPause"]
                 target:self action:@selector(playPause:)];
     }
     
-    if ([defaults objectForKey:@"NextTrack"] != nil)
-    {
+    if ([defaults objectForKey:@"NextTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack"
                 combo:[defaults keyComboForKey:@"NextTrack"]
                 target:self action:@selector(nextSong:)];
     }
     
-    if ([defaults objectForKey:@"PrevTrack"] != nil)
-    {
+    if ([defaults objectForKey:@"PrevTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
                 combo:[defaults keyComboForKey:@"PrevTrack"]
                 target:self action:@selector(prevSong:)];
     }
     
-    if ([defaults objectForKey:@"TrackInfo"] != nil)
-    {
+    if ([defaults objectForKey:@"TrackInfo"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
                 combo:[defaults keyComboForKey:@"TrackInfo"]
                 target:self action:@selector(showCurrentTrackInfo)];
     }
     
-    if ([defaults objectForKey:@"UpcomingSongs"] != nil)
-    {
+    if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
                target:self action:@selector(showUpcomingSongs)];
     }
 }
 
-//Runs an AppleScript and returns the result as an NSString after stripping quotes, if needed.
+//Runs an AppleScript and returns the result as an NSString after stripping quotes, if needed. It takes in script and automatically adds the tell iTunes and end tell statements.
 - (NSString *)runScriptAndReturnResult:(NSString *)script
 {
     AEDesc scriptDesc, resultDesc;
@@ -356,24 +395,27 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     NSString *result;
     Ptr buffer;
     
+    script = [NSString stringWithFormat:@"tell application \"iTunes\"\n%@\nend tell", script];
+    
     AECreateDesc(typeChar, [script cString], [script cStringLength], 
 &scriptDesc);
     
-    OSADoScript(OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype), &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
+    OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
     
     length = AEGetDescDataSize(&resultDesc);
     buffer = malloc(length);
     
     AEGetDescData(&resultDesc, buffer, length);
+    AEDisposeDesc(&scriptDesc);
+    AEDisposeDesc(&resultDesc);
     result = [NSString stringWithCString:buffer length:length];
-    if (![result isEqualToString:@""] &&
-        ([result characterAtIndex:0] == '\"') &&
-        ([result characterAtIndex:[result length] - 1] == '\"'))
-    {
+    if ( (! [result isEqualToString:@""])      &&
+         ([result characterAtIndex:0] == '\"') &&
+         ([result characterAtIndex:[result length] - 1] == '\"') ) {
         result = [result substringWithRange:NSMakeRange(1, [result length] - 2)];
     }
     free(buffer);
-    buffer = NULL;
+    buffer = nil;
     return result;
 }
 
@@ -381,53 +423,35 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 - (void)timerUpdate
 {
     int pid;
-    if ((GetProcessPID(&iTunesPSN, &pid) == noErr) && (pid > 0))
-    {
-        int trackPlayingIndex = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn index of current track\nend tell"] intValue];
-        if (trackPlayingIndex != curTrackIndex)
-        {
+    
+    if (GetProcessPID(&iTunesPSN, &pid) == noErr) {
+        int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+        
+        if (trackPlayingIndex != curTrackIndex) {
             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }
-        /*else
-        {
-            NSString *playlist = [self runScriptAndReturnResult:@"tell application\n\"iTunes\"\nreturn name of current playlist\nend tell"];
-            
-            if (![playlist isEqualToString:curPlaylist])
-            {
-                [self updateMenu];
-                NSLog(@"update due to playlist change");
-                curPlaylist = [NSString stringWithString:playlist];
-            }
-        }*/
+       	
         //Update Play/Pause menu item
-        if (playPauseMenuItem)
-        {
-            if ([[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn player state\nend tell"] isEqualToString:@"playing"])
-            {
+        if (playPauseMenuItem){
+            if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
                 [playPauseMenuItem setTitle:@"Pause"];
-            }
-            else
-            {
+            } else {
                 [playPauseMenuItem setTitle:@"Play"];
             }
         }
-    }
-    else
-    {
-        NSMenu *menu2 = [[[NSMenu alloc] initWithTitle:@""] autorelease];
+    } else {
+        [menu release];
+        menu = [[NSMenu alloc] initWithTitle:@""];
+        [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
+        [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
+        [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
+        [statusItem setMenu:menu];
         
-        [refreshTimer invalidate]; //Stop the timer
-        refreshTimer = NULL;
         [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
-        
-        [[menu2 addItemWithTitle:@"Open iTunes" 
-action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
-        [[menu2 addItemWithTitle:@"Preferences" 
-action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        [[menu2 addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) 
-keyEquivalent:@""] setTarget:self];
-        [statusItem setMenu:menu2];
+        [refreshTimer invalidate];
+        refreshTimer = nil;
+        [self clearHotKeys];
     }
 }
 
@@ -443,7 +467,6 @@ keyEquivalent:@""] setTarget:self];
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     [statusItem setMenu:menu]; //Set the menu back to the main one
-    
     [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
 }
 
@@ -454,14 +477,10 @@ keyEquivalent:@""] setTarget:self];
     procNum.highLongOfPSN = kNoProcess;
     procNum.lowLongOfPSN = 0;
     
-    while ( (GetNextProcess(&procNum) == noErr) ) 
-    {
+    while ( (GetNextProcess(&procNum) == noErr) ) {
         CFStringRef procName;
-        
-        if ( (CopyProcessName(&procNum, &procName) == noErr) )
-        {
-            if ([(NSString *)procName isEqualToString:@"iTunes"])
-            {
+        if ( (CopyProcessName(&procNum, &procName) == noErr) ) {
+            if ([(NSString *)procName isEqualToString:@"iTunes"]) {
                 return procNum;
             }
             [(NSString *)procName release];
@@ -477,7 +496,7 @@ andEventID:(AEEventID)eventID
     OSType iTunesType = 'hook';
     AppleEvent event, reply;
     
-    AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, NULL, "");
+    AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
     
     AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
     AEDisposeDesc(&event);
@@ -490,32 +509,39 @@ andEventID:(AEEventID)eventID
 
 - (void)playTrack:(id)sender
 {
-    [self runScriptAndReturnResult:[NSString stringWithFormat:@"tell application \"iTunes\"\nplay track %i of current playlist\nend tell", [[sender representedObject] intValue]]];
+    [self runScriptAndReturnResult:[NSString stringWithFormat:@"play track %i of current playlist", [[sender representedObject] intValue]]];
     [self updateMenu];
 }
 
 - (void)selectPlaylist:(id)sender
 {
-    [self runScriptAndReturnResult:[NSString stringWithFormat:@"tell application \"iTunes\"\nplay playlist %i\nend tell", [[sender representedObject] intValue]]];
+    int playlist = [[sender representedObject] intValue];
+    [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
+    [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
     [self updateMenu];
 }
 
+- (void)selectEQPreset:(id)sender
+{
+    int curSet = [[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue];
+    int item = [[sender representedObject] intValue];
+    [self runScriptAndReturnResult:[NSString stringWithFormat:@"set current EQ preset to EQ preset %i", item]];
+    [self runScriptAndReturnResult:@"set EQ enabled to 1"];
+    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+}
+
 - (void)playPause:(id)sender
 {
-    NSString *state = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn player state\nend tell"];
-    if ([state isEqualToString:@"playing"])
-    {
+    NSString *state = [self runScriptAndReturnResult:@"return player state"];
+    if ([state isEqualToString:@"playing"]) {
         [self sendAEWithEventClass:'hook' andEventID:'Paus'];
         [playPauseMenuItem setTitle:@"Play"];
-    }
-    else if ([state isEqualToString:@"fast forwarding"] || [state 
-isEqualToString:@"rewinding"])
-    {
+    } else if ([state isEqualToString:@"fast forwarding"] || [state 
+isEqualToString:@"rewinding"]) {
         [self sendAEWithEventClass:'hook' andEventID:'Paus'];
         [self sendAEWithEventClass:'hook' andEventID:'Play'];
-    }
-    else
-    {
+    } else {
         [self sendAEWithEventClass:'hook' andEventID:'Play'];
         [playPauseMenuItem setTitle:@"Pause"];
     }
@@ -553,8 +579,7 @@ isEqualToString:@"rewinding"])
 
 - (void)showPreferences:(id)sender
 {
-    if (!prefsController)
-    {
+    if (!prefsController) {
         prefsController = [[PreferencesController alloc] initWithMenuTunes:self];
         [self clearHotKeys];
     }
@@ -563,7 +588,9 @@ isEqualToString:@"rewinding"])
 
 - (void)closePreferences
 {
-    [self setupHotKeys];
+    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) {
+        [self setupHotKeys];
+    }
     [prefsController release];
     prefsController = nil;
 }
@@ -576,57 +603,49 @@ isEqualToString:@"rewinding"])
 
 - (void)showCurrentTrackInfo
 {
-    NSString *trackName = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn name of current track\nend tell"];
-    if (!statusController && [trackName length])
-    {
+    NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
+    if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
         int lines = 1;
         
-        if ([defaults boolForKey:@"showName"])
-        {
+        if ([defaults boolForKey:@"showName"]) {
+            if ([defaults boolForKey:@"showArtist"]) {
+                NSString *trackArtist = [self runScriptAndReturnResult:@"return artist of current track"];
+                trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName];
+            }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];
+            if ([trackName length] > 38) {
+                lines++;
+            }
             lines++;
         }
         
-        if ([defaults boolForKey:@"showArtist"])
-        {
-            NSString *trackArtist = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn artist of current track\nend tell"];
-            stringToShow = [stringToShow stringByAppendingString:trackArtist];
-            stringToShow = [stringToShow stringByAppendingString:@"\n"];
-            lines++;
-        }
-        
-        if ([defaults boolForKey:@"showAlbum"])
-        {
-            NSString *trackAlbum = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn album of current track\nend tell"];
-            stringToShow = [stringToShow stringByAppendingString:trackAlbum];
-            stringToShow = [stringToShow stringByAppendingString:@"\n"];
-            lines++;
+        if ([defaults boolForKey:@"showAlbum"]) {
+            NSString *trackAlbum = [self runScriptAndReturnResult:@"return album of current track"];
+            if ([trackAlbum length]) {
+                stringToShow = [stringToShow stringByAppendingString:trackAlbum];
+                stringToShow = [stringToShow stringByAppendingString:@"\n"];
+                lines++;
+            }
         }
         
-        //Rating - maybe
-        //Year - maybe
-        
-        if ([defaults boolForKey:@"showTime"])
-        {
-            NSString *trackLength = [self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn time of current track\nend tell"];
-            stringToShow = [stringToShow stringByAppendingString:trackLength];
-            stringToShow = [stringToShow stringByAppendingString:@"\n"];
-            lines++;
+        if ([defaults boolForKey:@"showTime"]) {
+            NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
+            if ([trackTime length]) {
+                stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
+                lines++;
+            }
         }
         
         {
-            int trackTimeLeft = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn (duration of current track) - player position\nend tell"] intValue];
+            int trackTimeLeft = [[self runScriptAndReturnResult:@"return (duration of current track) - player position"] intValue];
             int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60;
-            if (seconds < 10)
-            {
+            if (seconds < 10) {
                 stringToShow = [stringToShow stringByAppendingString:
                             [NSString stringWithFormat:@"Time Remaining: %i:0%i", minutes, seconds]];
-            }
-            else
-            {
+            } else {
                 stringToShow = [stringToShow stringByAppendingString:
                             [NSString stringWithFormat:@"Time Remaining: %i:%i", minutes, seconds]];
             }
@@ -634,35 +653,40 @@ isEqualToString:@"rewinding"])
         
         statusController = [[StatusWindowController alloc] init];
         [statusController setTrackInfo:stringToShow lines:lines];
-        [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO];
+        [NSTimer scheduledTimerWithTimeInterval:3.0
+                                         target:self
+                                       selector:@selector(fadeAndCloseStatusWindow)
+                                       userInfo:nil
+                                        repeats:NO];
     }
 }
 
 - (void)showUpcomingSongs
 {
-    if (!statusController)
-    {
-        int numSongs = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn number of tracks in current playlist\nend tell"] intValue];
+    if (!statusController) {
+        int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
         
-        if (numSongs > 0)
-        {
+        if (numSongs > 0) {
             int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
-            int curTrack = [[self runScriptAndReturnResult:@"tell application \"iTunes\"\nreturn index of current track\nend tell"] intValue];
+            int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
             int i;
             NSString *songs = @"";
             
             statusController = [[StatusWindowController alloc] init];
-            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++)
-            {
-                if (i <= numSongs)
-                {
-                    NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"tell application \"iTunes\"\nreturn name of track %i of current playlist\nend tell", i]];
+            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]];
                     songs = [songs stringByAppendingString:curSong];
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
             [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance];
-            [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO];
+            [NSTimer scheduledTimerWithTimeInterval:3.0
+                                             target:self
+                                           selector:@selector(fadeAndCloseStatusWindow)
+                                           userInfo:nil
+                                            repeats:NO];
         }
     }
 }
@@ -674,4 +698,35 @@ isEqualToString:@"rewinding"])
     statusController = nil;
 }
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSApplication DELEGATE METHODS
+/*************************************************************************/
+
+- (void)applicationWillTerminate:(NSNotification *)note
+{
+    [self clearHotKeys];
+    [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark DEALLOCATION METHODS
+/*************************************************************************/
+
+- (void)dealloc
+{
+    if (refreshTimer) {
+        [refreshTimer invalidate];
+        refreshTimer = nil;
+    }
+    CloseComponent(asComponent);
+    [statusItem release];
+    [menu release];
+//  [view release];
+    [super dealloc];
+}
+
+
 @end