App did launch/quit notifications in the plugin now

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index e8736fa..477201e 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -45,8 +45,13 @@ Things to do:
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     currentRemote = [self loadRemote];
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     currentRemote = [self loadRemote];

+    [currentRemote begin];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+    

     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);

-
+    

     [self registerDefaultsIfNeeded];
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     [self registerDefaultsIfNeeded];
     
     menu = [[NSMenu alloc] initWithTitle:@""];


@@ -56,10 +61,10 @@ Things to do:
     {
         [self rebuildMenu];
         refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
     {
         [self rebuildMenu];
         refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5

-                                                    target:self
-                                                    selector:@selector(timerUpdate)
-                                                    userInfo:nil
-                                                    repeats:YES];
+                            target:self
+                            selector:@selector(timerUpdate)
+                            userInfo:nil
+                            repeats:YES];

     }
     else
     {
     }
     else
     {


@@ -67,7 +72,6 @@ Things to do:
         [[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];
         [[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 = nil;
     }
 
         refreshTimer = nil;
     }
 


@@ -204,9 +208,9 @@ Things to do:
     int i;
     
     trackInfoIndex = -1;
     int i;
     
     trackInfoIndex = -1;

-    didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
-    didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0);
-    
+    lastSongIndex = -1;
+    didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
+    didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);

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


@@ -300,7 +304,6 @@ Things to do:
         }
     }
     
         }
     }
     

-    curTrackIndex = -1; //Force update of everything

     [self timerUpdate]; //Updates dynamic info in the menu
     
     [self clearHotKeys];
     [self timerUpdate]; //Updates dynamic info in the menu
     
     [self clearHotKeys];


@@ -332,14 +335,14 @@ Things to do:
     if (trackInfoIndex > -1)
     {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
     if (trackInfoIndex > -1)
     {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";

-        curSongName = [self runScriptAndReturnResult:@"return name of current track"];
+        curSongName = [currentRemote currentSongTitle];

         
         if ([defaults boolForKey:@"showAlbum"]) {
         
         if ([defaults boolForKey:@"showAlbum"]) {

-            curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
+            curAlbumName = [currentRemote currentSongAlbum];

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

-            curArtistName = [self runScriptAndReturnResult:@"return artist of current track"];
+            curArtistName = [currentRemote currentSongArtist];

         }
         
         if ([curSongName length] > 0) {
         }
         
         if ([curSongName length] > 0) {


@@ -361,7 +364,7 @@ Things to do:
             
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
             
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {

-                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]]

                                                         action:nil
                                                         keyEquivalent:@""];
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                                                         action:nil
                                                         keyEquivalent:@""];
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];


@@ -436,11 +439,12 @@ Things to do:
 //Rebuild the upcoming songs submenu. Can be improved a lot.
 - (void)rebuildUpcomingSongsMenu
 {
 //Rebuild the upcoming songs submenu. Can be improved a lot.
 - (void)rebuildUpcomingSongsMenu
 {

-    int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
+    int curIndex = [currentRemote currentPlaylistIndex];
+    int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curIndex];

     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
     if (!isPlayingRadio) {
         if (numSongs > 0) {
     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
     if (!isPlayingRadio) {
         if (numSongs > 0) {

-            int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+            int curTrack = [currentRemote currentSongIndex];

             int i;
             
             [upcomingSongsMenu release];
             int i;
             
             [upcomingSongsMenu release];


@@ -450,7 +454,7 @@ Things to do:
             
             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
             
             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]];
+                    NSString *curSong = [currentRemote songTitleAtIndex:i];

                     NSMenuItem *songItem;
                     songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
                     [songItem setTarget:self];
                     NSMenuItem *songItem;
                     songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
                     [songItem setTarget:self];


@@ -470,22 +474,22 @@ Things to do:
 
 - (void)rebuildPlaylistMenu
 {
 
 - (void)rebuildPlaylistMenu
 {

-    int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue];
-    int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+    NSArray *playlists = [currentRemote playlists];
+    int i, curPlaylist = [currentRemote currentPlaylistIndex];

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

-    if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems]))
+    if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems]))

         return;
     
     [playlistMenu release];
     playlistMenu = [[NSMenu alloc] initWithTitle:@""];
     
         return;
     
     [playlistMenu release];
     playlistMenu = [[NSMenu alloc] initWithTitle:@""];
     

-    for (i = 1; i <= numPlaylists; i++) {
-        NSString *playlistName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of playlist %i", i]];
+    for (i = 1; i < [playlists count]; i++) {
+        NSString *playlistName = [playlists objectAtIndex:i];

         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
         [tempItem setTarget:self];
         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
         [tempItem setTarget:self];


@@ -503,17 +507,17 @@ Things to do:
 //Build a menu with the list of all available EQ presets
 - (void)rebuildEQPresetsMenu
 {
 //Build a menu with the list of all available EQ presets
 - (void)rebuildEQPresetsMenu
 {

-    int numSets = [[self runScriptAndReturnResult:@"return number of EQ presets"] intValue];
+    NSArray *eqPresets = [currentRemote eqPresets];

     int i;
     
     int i;
     

-    if (eqMenu && (numSets == [eqMenu numberOfItems]))
+    if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))

         return;
     
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
         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]];
+    for (i = 0; i < [eqPresets count]; i++) {
+        NSString *setName = [eqPresets objectAtIndex:i];

         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
         [tempItem setTarget:self];
         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
         [tempItem setTarget:self];


@@ -523,7 +527,7 @@ Things to do:
     }
     [eqItem setSubmenu:eqMenu];
     
     }
     [eqItem setSubmenu:eqMenu];
     

-    [[eqMenu itemAtIndex:[[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue] - 1] setState:NSOnState];
+    [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState];

 }
 
 - (void)clearHotKeys
 }
 
 - (void)clearHotKeys


@@ -605,13 +609,13 @@ Things to do:
 //Called when the timer fires.
 - (void)timerUpdate
 {
 //Called when the timer fires.
 - (void)timerUpdate
 {

-    int pid;
-    if (GetProcessPID(&iTunesPSN, &pid) == noErr) {
-        int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+    if ([currentRemote playerState] != stopped) {
+        int trackPlayingIndex = [currentRemote currentSongIndex];
+        int playlist = [currentRemote currentPlaylistIndex];

         
         

-        if (trackPlayingIndex != curTrackIndex) {
+        if (trackPlayingIndex != lastSongIndex) {

             bool wasPlayingRadio = isPlayingRadio;
             bool wasPlayingRadio = isPlayingRadio;

-            isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+            isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];

             if (isPlayingRadio && !wasPlayingRadio) {
                 int i;
                 for (i = 0; i < [playlistMenu numberOfItems]; i++)
             if (isPlayingRadio && !wasPlayingRadio) {
                 int i;
                 for (i = 0; i < [playlistMenu numberOfItems]; i++)


@@ -625,14 +629,13 @@ Things to do:
                 [temp release];
             }
             [self updateMenu];
                 [temp release];
             }
             [self updateMenu];

-            curTrackIndex = trackPlayingIndex;
+            lastSongIndex = trackPlayingIndex;

         }
         else
         {
         }
         else
         {

-            int playlist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
-            if (playlist != curPlaylistIndex) {
+            if (playlist != [currentRemote currentPlaylistIndex]) {

                 bool wasPlayingRadio = isPlayingRadio;
                 bool wasPlayingRadio = isPlayingRadio;

-                isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+                isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];

                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;
                     for (i = 0; i < [playlistMenu numberOfItems]; i++)
                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;
                     for (i = 0; i < [playlistMenu numberOfItems]; i++)


@@ -646,30 +649,17 @@ Things to do:
                     [temp release];
                 }
                 [self updateMenu];
                     [temp release];
                 }
                 [self updateMenu];

-                curTrackIndex = trackPlayingIndex;
-                curPlaylistIndex = playlist;
+                lastSongIndex = trackPlayingIndex;

             }
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){
             }
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){

-            if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
+            if ([currentRemote playerState] == playing) {

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

-    } 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];
-        
-        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
-        [refreshTimer invalidate];
-        refreshTimer = nil;
-        [self clearHotKeys];

     }
 }
 
     }
 }
 


@@ -685,26 +675,42 @@ Things to do:
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     [statusItem setMenu:menu]; //Set the menu back to the main one
     
     [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];
+}
+
+- (void)iTunesTerminated:(NSNotification *)note
+{
+    [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];
+    refreshTimer = nil;
+    [self clearHotKeys];

 }
 
 //Return the PSN of iTunes, if it's running
 - (ProcessSerialNumber)iTunesPSN
 {
 }
 
 //Return the PSN of iTunes, if it's running
 - (ProcessSerialNumber)iTunesPSN
 {

-    ProcessSerialNumber procNum;
-    procNum.highLongOfPSN = kNoProcess;
-    procNum.lowLongOfPSN = 0;
+    NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
+    ProcessSerialNumber number;
+    int i;

     
     

-    while ( (GetNextProcess(&procNum) == noErr) ) {
-        CFStringRef procName;
-        if ( (CopyProcessName(&procNum, &procName) == noErr) ) {
-            if ([(NSString *)procName isEqualToString:@"iTunes"]) {
-                return procNum;
-            }
-            CFRelease(procName);
+    number.highLongOfPSN = kNoProcess;
+    
+    for (i = 0; i < [apps count]; i++)
+    {
+        NSDictionary *curApp = [apps objectAtIndex:i];
+        
+        if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"])
+        {
+            number.highLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberHigh"] intValue];
+            number.lowLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberLow"] intValue];

         }
     }
         }
     }

-    return procNum;
+    return number;

 }
 
 //Send an AppleEvent with a given event ID
 }
 
 //Send an AppleEvent with a given event ID


@@ -721,13 +727,17 @@ andEventID:(AEEventID)eventID
     AEDisposeDesc(&reply);
 }
 
     AEDisposeDesc(&reply);
 }
 

+//

 //
 // Selectors - called from status item menu
 //
 //
 // Selectors - called from status item menu
 //

+//
+
+// Plugin dependent selectors

 
 - (void)playTrack:(id)sender
 {
 
 - (void)playTrack:(id)sender
 {

-    [self runScriptAndReturnResult:[NSString stringWithFormat:@"play track %i of current playlist", [[sender representedObject] intValue]]];
+    [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];

     [self updateMenu];
 }
 
     [self updateMenu];
 }
 


@@ -735,64 +745,69 @@ andEventID:(AEEventID)eventID
 {
     int playlist = [[sender representedObject] intValue];
     if (!isPlayingRadio) {
 {
     int playlist = [[sender representedObject] intValue];
     if (!isPlayingRadio) {

-        int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+        int curPlaylist = [currentRemote currentPlaylistIndex];

         [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
     }
         [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
     }

-    [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
+    [currentRemote switchToPlaylistAtIndex:playlist];

     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];

+    [self updateMenu];

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

-    int curSet = [[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue];
+    int curSet = [currentRemote currentEQPresetIndex];

     int item = [[sender representedObject] 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"];
+    [currentRemote switchToEQAtIndex:item];

     [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
     [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
 }
 
 - (void)playPause:(id)sender
 {
     [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
     [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
 }
 
 - (void)playPause:(id)sender
 {

-    NSString *state = [self runScriptAndReturnResult:@"return player state"];
-    if ([state isEqualToString:@"playing"]) {
-        [self sendAEWithEventClass:'hook' andEventID:'Paus'];
+    PlayerState state = [currentRemote playerState];
+    if (state == playing) {
+        [currentRemote pause];

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

-    } else if ([state isEqualToString:@"fast forwarding"] || [state 
-isEqualToString:@"rewinding"]) {
-        [self sendAEWithEventClass:'hook' andEventID:'Paus'];
-        [self sendAEWithEventClass:'hook' andEventID:'Play'];
+    } else if ((state == forwarding) || (state == rewinding)) {
+        [currentRemote play];
+        [currentRemote pause];

     } else {
     } else {

-        [self sendAEWithEventClass:'hook' andEventID:'Play'];
+        [currentRemote play];

         [playPauseMenuItem setTitle:@"Pause"];
     }
 }
 
 - (void)nextSong:(id)sender
 {
         [playPauseMenuItem setTitle:@"Pause"];
     }
 }
 
 - (void)nextSong:(id)sender
 {

-    [self sendAEWithEventClass:'hook' andEventID:'Next'];
+    [currentRemote goToNextSong];

 }
 
 - (void)prevSong:(id)sender
 {
 }
 
 - (void)prevSong:(id)sender
 {

-    [self sendAEWithEventClass:'hook' andEventID:'Prev'];
+    [currentRemote goToPreviousSong];

 }
 
 - (void)fastForward:(id)sender
 {
 }
 
 - (void)fastForward:(id)sender
 {

-    [self sendAEWithEventClass:'hook' andEventID:'Fast'];
+    [currentRemote fastForward];

 }
 
 - (void)rewind:(id)sender
 {
 }
 
 - (void)rewind:(id)sender
 {

-    [self sendAEWithEventClass:'hook' andEventID:'Rwnd'];
+    [currentRemote rewind];

 }
 
 }
 

+//
+//
+// Plugin independent selectors
+//
+//

 - (void)quitMenuTunes:(id)sender
 {
     [NSApp terminate:self];
 }
 
 - (void)quitMenuTunes:(id)sender
 {
     [NSApp terminate:self];
 }
 

+//How is this going to work, now that we're pluginized?

 - (void)openiTunes:(id)sender
 {
     [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];
 - (void)openiTunes:(id)sender
 {
     [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];


@@ -824,14 +839,14 @@ isEqualToString:@"rewinding"]) {
 
 - (void)showCurrentTrackInfo
 {
 
 - (void)showCurrentTrackInfo
 {

-    NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
+    NSString *trackName = [currentRemote currentSongTitle];

     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
         
         if ([defaults boolForKey:@"showName"]) {
             if ([defaults boolForKey:@"showArtist"]) {
     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
         
         if ([defaults boolForKey:@"showName"]) {
             if ([defaults boolForKey:@"showArtist"]) {

-                NSString *trackArtist = [self runScriptAndReturnResult:@"return artist of current track"];
+                NSString *trackArtist = [currentRemote currentSongArtist];

                 trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName];
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
                 trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName];
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];


@@ -839,7 +854,7 @@ isEqualToString:@"rewinding"]) {
         }
         
         if ([defaults boolForKey:@"showAlbum"]) {
         }
         
         if ([defaults boolForKey:@"showAlbum"]) {

-            NSString *trackAlbum = [self runScriptAndReturnResult:@"return album of current track"];
+            NSString *trackAlbum = [currentRemote currentSongAlbum];

             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];
             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];


@@ -847,14 +862,14 @@ isEqualToString:@"rewinding"]) {
         }
         
         if ([defaults boolForKey:@"showTime"]) {
         }
         
         if ([defaults boolForKey:@"showTime"]) {

-            NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
+            NSString *trackTime = [currentRemote currentSongLength];

             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
             }
         }
         
         {
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
             }
         }
         
         {

-            int trackTimeLeft = [[self runScriptAndReturnResult:@"return (duration of current track) - player position"] intValue];
+            int trackTimeLeft = [[currentRemote currentSongRemaining] intValue];

             int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60;
             if (seconds < 10) {
                 stringToShow = [stringToShow stringByAppendingString:
             int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60;
             if (seconds < 10) {
                 stringToShow = [stringToShow stringByAppendingString:


@@ -877,20 +892,20 @@ isEqualToString:@"rewinding"]) {
 
 - (void)showUpcomingSongs
 {
 
 - (void)showUpcomingSongs
 {

+    int curPlaylist = [currentRemote currentPlaylistIndex];

     if (!statusController) {
     if (!statusController) {

-        int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
+        int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];

         
         if (numSongs > 0) {
             int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
         
         if (numSongs > 0) {
             int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];

-            int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+            int curTrack = [currentRemote currentSongIndex];

             int i;
             NSString *songs = @"";
             
             statusController = [[StatusWindowController alloc] init];
             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
             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:@"return name of track %i of current playlist", i]];
+                    NSString *curSong = [currentRemote songTitleAtIndex:i];

                     songs = [songs stringByAppendingString:curSong];
                     songs = [songs stringByAppendingString:@"\n"];
                 }
                     songs = [songs stringByAppendingString:curSong];
                     songs = [songs stringByAppendingString:@"\n"];
                 }


@@ -939,24 +954,39 @@ isEqualToString:@"rewinding"]) {
     switch (code)
     {
         case 36:
     switch (code)
     {
         case 36:

+            charcode = '\r';

         break;
         
         case 48:
         break;
         
         case 48:

+            charcode = '\t';

         break;
         
         break;
         

+        //Space -- ARGH!

         case 49:
         case 49:

+        {
+            /*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
+            NSLog(@"%@", menuRef);
+            SetMenuItemCommandKey(menuRef, 0, NO, 49);
+            SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier);
+            SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);
+            charcode = 'b';*/
+        }

         break;
         
         case 51:
             charcode = NSDeleteFunctionKey;
         break;
         
         case 51:
             charcode = NSDeleteFunctionKey;

-        break;        
+        break;
+        

         case 53:
         case 53:

+            charcode = '\e';

         break;
         break;

-                
+        

         case 71:
         case 71:

+            charcode = '\e';

         break;
         
         case 76:
         break;
         
         case 76:

+            charcode = '\r';

         break;
         
         case 96:
         break;
         
         case 96:


@@ -1012,6 +1042,7 @@ isEqualToString:@"rewinding"]) {
         break;
         
         case 115:
         break;
         
         case 115:

+            charcode = NSHomeFunctionKey;

         break;
         
         case 116:
         break;
         
         case 116:


@@ -1069,7 +1100,7 @@ isEqualToString:@"rewinding"]) {
         keyTrans = KeyTranslate(kchr, code, &state);
         charCode = keyTrans;
         [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]];
         keyTrans = KeyTranslate(kchr, code, &state);
         charCode = keyTrans;
         [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]];

-    } else {
+    } else if (charcode != 'b') {

         [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]];
     }
 }
         [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]];
     }
 }


@@ -1098,6 +1129,7 @@ isEqualToString:@"rewinding"]) {
         refreshTimer = nil;
     }
     CloseComponent(asComponent);
         refreshTimer = nil;
     }
     CloseComponent(asComponent);

+    [currentRemote halt];

     [statusItem release];
     [menu release];
 //  [view release];
     [statusItem release];
     [menu release];
 //  [view release];