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 e8736fa..0c08e20 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -1,16 +1,7 @@
-/*
-Things to do:
-¥ Make preferences window pretty
-¥ Optimize
-¥ Apple Events! Apple Events! Apple Events!
-¥ Manual and webpage
-¥ Finish up registration frontend
-*/
-

 #import "MenuTunes.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "MenuTunes.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"

-#import "StatusWindowController.h"
+#import "StatusWindow.h"

 
 @interface MenuTunes(Private)
 - (ITMTRemote *)loadRemote;
 
 @interface MenuTunes(Private)
 - (ITMTRemote *)loadRemote;


@@ -19,9 +10,7 @@ Things to do:
 - (void)rebuildPlaylistMenu;
 - (void)rebuildEQPresetsMenu;
 - (void)setupHotKeys;
 - (void)rebuildPlaylistMenu;
 - (void)rebuildEQPresetsMenu;
 - (void)setupHotKeys;

-- (NSString *)runScriptAndReturnResult:(NSString *)script;

 - (void)timerUpdate;
 - (void)timerUpdate;

-- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;

 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 


@@ -38,6 +27,7 @@ Things to do:
 {
     if ( ( self = [super init] ) ) {
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
 {
     if ( ( self = [super init] ) ) {
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];

+        statusWindow = [StatusWindow sharedWindow];

     }
     return self;
 }
     }
     return self;
 }


@@ -45,34 +35,22 @@ Things to do:
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     currentRemote = [self loadRemote];
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     currentRemote = [self loadRemote];

-    asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-
+    [currentRemote begin];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+    

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

-    iTunesPSN = [self iTunesPSN]; //Get PSN of iTunes if it's running

     
     

-    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)))
-    {
-        [self rebuildMenu];
-        refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
-                                                    target:self
-                                                    selector:@selector(timerUpdate)
-                                                    userInfo:nil
-                                                    repeats:YES];
-    }
-    else
-    {
-        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 = nil;
+    if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
+        [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"]];


@@ -84,7 +62,7 @@ Things to do:
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];

-
+    

     if (folderPath) {
         NSArray      *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
         NSEnumerator *enumerator     = [bundlePathList objectEnumerator];
     if (folderPath) {
         NSArray      *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
         NSEnumerator *enumerator     = [bundlePathList objectEnumerator];


@@ -105,14 +83,14 @@ Things to do:
             }
         }
 
             }
         }
 

-//      if ( [remoteArray count] > 0 ) {
+//      if ( [remoteArray count] > 0 ) {  // UNCOMMENT WHEN WE HAVE > 1 PLUGIN

 //          if ( [remoteArray count] > 1 ) {
 //              [remoteArray sortUsingSelector:@selector(sortAlpha:)];
 //          }
 //          [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
 //      }
     }
 //          if ( [remoteArray count] > 1 ) {
 //              [remoteArray sortUsingSelector:@selector(sortAlpha:)];
 //          }
 //          [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
 //      }
     }

-    NSLog(@"%@", [remoteArray objectAtIndex:0]);
+//  NSLog(@"%@", [remoteArray objectAtIndex:0]);  //DEBUG

     return [remoteArray objectAtIndex:0];
 }
 
     return [remoteArray objectAtIndex:0];
 }
 


@@ -126,7 +104,7 @@ Things to do:
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     if (![defaults objectForKey:@"menu"]) {
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     if (![defaults objectForKey:@"menu"]) {

-        bool found = NO;
+        BOOL found = NO;

         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
         int i;
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
         int i;


@@ -141,6 +119,7 @@ Things to do:
                 @"<separator>",
                 @"Upcoming Songs",
                 @"Playlists",
                 @"<separator>",
                 @"Upcoming Songs",
                 @"Playlists",

+                @"Song Rating",

                 @"<separator>",
                 @"PreferencesÉ",
                 @"Quit",
                 @"<separator>",
                 @"PreferencesÉ",
                 @"Quit",


@@ -159,10 +138,14 @@ Things to do:
             }
         }
         
             }
         }
         

+        //
+        //This is teh sux
+        //We must fix it so it is no longer suxy

         if (!found) {
             if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
                 AEDesc scriptDesc, resultDesc;
                 NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
         if (!found) {
             if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
                 AEDesc scriptDesc, resultDesc;
                 NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];

+                ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);

                 
                 AECreateDesc(typeChar, [script cString], [script cStringLength], 
             &scriptDesc);
                 
                 AECreateDesc(typeChar, [script cString], [script cStringLength], 
             &scriptDesc);


@@ -171,6 +154,8 @@ Things to do:
                 
                 AEDisposeDesc(&scriptDesc);
                 AEDisposeDesc(&resultDesc);
                 
                 AEDisposeDesc(&scriptDesc);
                 AEDisposeDesc(&resultDesc);

+                
+                CloseComponent(asComponent);

             }
         }
     }
             }
         }
     }


@@ -204,9 +189,10 @@ 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;
+    lastPlaylistIndex = -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];


@@ -214,6 +200,7 @@ Things to do:
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;

+    songRatingMenuItem = nil;

     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;


@@ -230,8 +217,7 @@ Things to do:
                                     keyEquivalent:@""];
             [playPauseMenuItem setTarget:self];
             
                                     keyEquivalent:@""];
             [playPauseMenuItem setTarget:self];
             

-            if (tempCombo)
-            {
+            if (tempCombo) {

                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
                 [tempCombo release];
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
                 [tempCombo release];


@@ -243,8 +229,7 @@ Things to do:
                                         keyEquivalent:@""];
             
             [nextTrack setTarget:self];
                                         keyEquivalent:@""];
             
             [nextTrack setTarget:self];

-            if (tempCombo)
-            {
+            if (tempCombo) {

                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:nextTrack];
                 [tempCombo release];
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:nextTrack];
                 [tempCombo release];


@@ -256,51 +241,75 @@ Things to do:
                                         keyEquivalent:@""];
             
             [prevTrack setTarget:self];
                                         keyEquivalent:@""];
             
             [prevTrack setTarget:self];

-            if (tempCombo)
-            {
+            if (tempCombo) {

                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:prevTrack];
                 [tempCombo release];
             }
         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:prevTrack];
                 [tempCombo release];
             }
         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"

-                             action:@selector(fastForward:)
-                      keyEquivalent:@""] setTarget:self];
+                    action:@selector(fastForward:)
+                    keyEquivalent:@""] setTarget:self];

         } else if ([item isEqualToString:@"Rewind"]) {
             [[menu addItemWithTitle:@"Rewind"
         } else if ([item isEqualToString:@"Rewind"]) {
             [[menu addItemWithTitle:@"Rewind"

-                             action:@selector(rewind:)
-                      keyEquivalent:@""] setTarget:self];
+                    action:@selector(rewind:)
+                    keyEquivalent:@""] setTarget:self];

         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"

-                                                action:nil
-                                         keyEquivalent:@""];
+                    action:nil
+                    keyEquivalent:@""];

         } else if ([item isEqualToString:@"Playlists"]) {
             playlistItem = [menu addItemWithTitle:@"Playlists"
         } else if ([item isEqualToString:@"Playlists"]) {
             playlistItem = [menu addItemWithTitle:@"Playlists"

-                                           action:nil
-                                    keyEquivalent:@""];
+                    action:nil
+                    keyEquivalent:@""];

         } else if ([item isEqualToString:@"EQ Presets"]) {
             eqItem = [menu addItemWithTitle:@"EQ Presets"
         } else if ([item isEqualToString:@"EQ Presets"]) {
             eqItem = [menu addItemWithTitle:@"EQ Presets"

-                                     action:nil
-                              keyEquivalent:@""];
+                    action:nil
+                    keyEquivalent:@""];

         } else if ([item isEqualToString:@"PreferencesÉ"]) {
             [[menu addItemWithTitle:@"PreferencesÉ"
         } else if ([item isEqualToString:@"PreferencesÉ"]) {
             [[menu addItemWithTitle:@"PreferencesÉ"

-                             action:@selector(showPreferences:)
-                      keyEquivalent:@""] setTarget:self];
+                    action:@selector(showPreferences:)
+                    keyEquivalent:@""] setTarget:self];

         } else if ([item isEqualToString:@"Quit"]) {
             [[menu addItemWithTitle:@"Quit"
         } else if ([item isEqualToString:@"Quit"]) {
             [[menu addItemWithTitle:@"Quit"

-                             action:@selector(quitMenuTunes:)
-                      keyEquivalent:@""] setTarget:self];
+                    action:@selector(quitMenuTunes:)
+                    keyEquivalent:@""] setTarget:self];

         } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
             [menu addItemWithTitle:@"No Song"
         } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
             [menu addItemWithTitle:@"No Song"

-                            action:nil
-                     keyEquivalent:@""];
+                    action:nil
+                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Song Rating"]) {
+            NSMenuItem *item;
+            int i;
+            NSString *curTitle = @".....";
+            
+            songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"
+                    action:nil
+                    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]];
         }
     }
     

-    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];


@@ -313,7 +322,7 @@ Things to do:
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     

-    if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
+    if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {

         return;
     }
     
         return;
     }
     


@@ -328,18 +337,16 @@ Things to do:
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }

-    
-    if (trackInfoIndex > -1)
-    {
+    if (trackInfoIndex > -1) {

         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         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,34 +368,44 @@ 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"]]
-                                                        action:nil
-                                                        keyEquivalent:@""];
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]]
+                            action:nil
+                            keyEquivalent:@""];

                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
                 
                 if ([curArtistName length] > 0) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curArtistName]
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
                 
                 if ([curArtistName length] > 0) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curArtistName]

-                                                        action:nil
-                                                        keyEquivalent:@""];
+                            action:nil
+                            keyEquivalent:@""];

                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
                 
                 if ([curAlbumName length] > 0) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
                 
                 if ([curAlbumName length] > 0) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]

-                                                        action:nil
-                                                        keyEquivalent:@""];
+                            action:nil
+                            keyEquivalent:@""];

                     [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"]) {
                 menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
             }
             
             if ([defaults boolForKey:@"showName"]) {
                 menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]

-                                                    action:nil
-                                                    keyEquivalent:@""];
+                            action:nil
+                            keyEquivalent:@""];

                 [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                 [menuItem release];
             }
                 [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                 [menuItem release];
             }


@@ -398,6 +415,9 @@ Things to do:
                 [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];


@@ -431,16 +451,19 @@ Things to do:
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }

+    [menu update];

 }
 
 //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"];
     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];

+    

     if (!isPlayingRadio) {
         if (numSongs > 0) {
     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 +473,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,30 +493,29 @@ 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)
-    {
+    if (isPlayingRadio) {

         curPlaylist = 0;
     }
         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 = 0; 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];

-        [tempItem setRepresentedObject:[NSNumber numberWithInt:i]];
+        [tempItem setRepresentedObject:[NSNumber numberWithInt:i + 1]];

         [playlistMenu addItem:tempItem];
         [tempItem release];
     }
     [playlistItem setSubmenu:playlistMenu];
         [playlistMenu addItem:tempItem];
         [tempItem release];
     }
     [playlistItem setSubmenu:playlistMenu];

+    [playlistItem setEnabled:YES];

     
     if (curPlaylist) {
         [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
     
     if (curPlaylist) {
         [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];


@@ -503,27 +525,40 @@ 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];
+    NSMenuItem *enabledItem;

     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]];
+    enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+                          action:@selector(toggleEqualizer)
+                          keyEquivalent:@""];
+    
+    if ([currentRemote equalizerEnabled] == NO) {
+        [enabledItem setState:NSOnState];
+    }
+    
+    [eqMenu addItem:[NSMenuItem separatorItem]];
+    
+    for (i = 0; i < [eqPresets count]; i++) {
+        NSString *setName = [eqPresets objectAtIndex:i];

         NSMenuItem *tempItem;
         NSMenuItem *tempItem;

+       if (setName) {

         tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
         [tempItem setTarget:self];
         [tempItem setRepresentedObject:[NSNumber numberWithInt:i]];
         [eqMenu addItem:tempItem];
         [tempItem release];
         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];
     
     }
     [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


@@ -570,232 +605,256 @@ Things to do:
     }
 }
 
     }
 }
 

-//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;
-    Size length;
-    NSString *result;
-    Ptr buffer;
-    
-    script = [NSString stringWithFormat:@"tell application \"iTunes\"\n%@\nend tell", script];
-    
-    AECreateDesc(typeChar, [script cString], [script cStringLength], 
-&scriptDesc);
-    
-    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] == '\"') ) {
-        result = [result substringWithRange:NSMakeRange(1, [result length] - 2)];
-    }
-    free(buffer);
-    buffer = nil;
-    return result;
-}
-

 //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];
+    int playlist = [currentRemote currentPlaylistIndex];
+    ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
+    
+    if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {
+        int trackPlayingIndex = [currentRemote currentSongIndex];

         
         

-        if (trackPlayingIndex != curTrackIndex) {
-            bool wasPlayingRadio = isPlayingRadio;
-            isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+        if (trackPlayingIndex != lastSongIndex) {
+            BOOL wasPlayingRadio = isPlayingRadio;
+            isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+            

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

+            } else {
+                [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];

             }
             }

+            

             if (wasPlayingRadio) {
                 NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
                 [menu insertItem:temp atIndex:trackInfoIndex + 1];
                 [temp release];
             }
             if (wasPlayingRadio) {
                 NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
                 [menu insertItem:temp atIndex:trackInfoIndex + 1];
                 [temp release];
             }

+            

             [self updateMenu];
             [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"];
+            lastSongIndex = trackPlayingIndex;
+        } else {
+            if (playlist != lastPlaylistIndex) {
+                BOOL wasPlayingRadio = isPlayingRadio;
+                isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+                

                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;
                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;

-                    for (i = 0; i < [playlistMenu numberOfItems]; i++)
-                    {
+                    for (i = 0; i < [playlistMenu numberOfItems]; i++) {

                         [[playlistMenu itemAtIndex:i] setState:NSOffState];
                     }
                 }
                         [[playlistMenu itemAtIndex:i] setState:NSOffState];
                     }
                 }

+                

                 if (wasPlayingRadio) {
                     NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
                     [menu insertItem:temp atIndex:trackInfoIndex + 1];
                     [temp release];
                 }
                 if (wasPlayingRadio) {
                     NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
                     [menu insertItem:temp atIndex:trackInfoIndex + 1];
                     [temp release];
                 }

+                
+                if (!isPlayingRadio) {
+                    int i;
+                    for (i = 0; i < [playlistMenu numberOfItems]; i++)
+                    {
+                        [[playlistMenu itemAtIndex:i] setState:NSOffState];
+                    }
+                    [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
+                }
+                

                 [self updateMenu];
                 [self updateMenu];

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

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

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

                 [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];
+    } else if ((lastPlaylistIndex > 0) && (playlist == 0)) {
+        NSMenuItem *menuItem;
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        //Remote the now playing item and add no song item
+        [menu removeItemAtIndex:trackInfoIndex];

         
         

-        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
-        [refreshTimer invalidate];
-        refreshTimer = nil;
-        [self clearHotKeys];
+        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];
+        }
+        
+        [playPauseMenuItem setTitle:@"Play"];
+        
+        didHaveArtistName = NO;
+        didHaveAlbumName = NO;
+        lastPlaylistIndex = -1;
+        lastSongIndex = -1;
+        
+        [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];

     }
 }
 
     }
 }
 

-- (void)iTunesLaunched:(NSNotification *)note
+- (void)remotePlayerLaunched:(NSNotification *)note

 {
 {

-    NSDictionary *info = [note userInfo];
-    
-    iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
-    iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
+    isAppRunning = ITMTRemotePlayerRunning;

     
     //Restart the timer
     
     //Restart the timer

-    refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 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
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing

+    if (playlistItem) {
+        [self rebuildPlaylistMenu];
+    }
+    if (eqItem) {
+        [self rebuildEQPresetsMenu];
+    }

     [statusItem setMenu:menu]; //Set the menu back to the main one
     [statusItem setMenu:menu]; //Set the menu back to the main one

-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];

 }
 
 }
 

-//Return the PSN of iTunes, if it's running
-- (ProcessSerialNumber)iTunesPSN
+- (void)runTimerInNewThread

 {
 {

-    ProcessSerialNumber procNum;
-    procNum.highLongOfPSN = kNoProcess;
-    procNum.lowLongOfPSN = 0;
-    
-    while ( (GetNextProcess(&procNum) == noErr) ) {
-        CFStringRef procName;
-        if ( (CopyProcessName(&procNum, &procName) == noErr) ) {
-            if ([(NSString *)procName isEqualToString:@"iTunes"]) {
-                return procNum;
-            }
-            CFRelease(procName);
-        }
-    }
-    return procNum;
+    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];

 }
 
 }
 

-//Send an AppleEvent with a given event ID
-- (void)sendAEWithEventClass:(AEEventClass)eventClass 
-andEventID:(AEEventID)eventID
+- (void)remotePlayerTerminated:(NSNotification *)note

 {
 {

-    OSType iTunesType = 'hook';
-    AppleEvent event, reply;
+    isAppRunning = ITMTRemotePlayerNotRunning;

     
     

-    AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
+    [menu release];
+    menu = [[NSMenu alloc] initWithTitle:@""];
+    [[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];

     
     

-    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
-    AEDisposeDesc(&event);
-    AEDisposeDesc(&reply);
+    [refreshTimer invalidate];
+    [refreshTimer release];
+    refreshTimer = nil;
+    [self clearHotKeys];

 }
 
 }
 

+//

 //
 // 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]]];
-    [self updateMenu];
+    [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];

 }
 
 - (void)selectPlaylist:(id)sender
 {
     int playlist = [[sender representedObject] intValue];
     if (!isPlayingRadio) {
 }
 
 - (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];
+        int curPlaylist = [currentRemote currentPlaylistIndex];
+        if (curPlaylist > 0) {
+            [[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"];
-    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
-    [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+    [currentRemote switchToEQAtIndex:item];
+    [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item + 2] setState:NSOnState];

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

-    NSString *state = [self runScriptAndReturnResult:@"return player state"];
-    if ([state isEqualToString:@"playing"]) {
-        [self sendAEWithEventClass:'hook' andEventID:'Paus'];
+    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
+    
+    if (state == ITMTRemotePlayerPlaying) {
+        [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 == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
+        [currentRemote pause];
+        [currentRemote play];

     } 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 forward];
+    [playPauseMenuItem setTitle:@"Play"];

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

-    [self sendAEWithEventClass:'hook' andEventID:'Rwnd'];
+    [currentRemote rewind];
+    [playPauseMenuItem setTitle:@"Play"];

 }
 
 }
 

-- (void)quitMenuTunes:(id)sender
+- (void)toggleEqualizer

 {
 {

-    [NSApp terminate:self];
+    [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];

 }
 
 }
 

-- (void)openiTunes:(id)sender
+- (void)setSongRating:(id)sender

 {
 {

-    [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];
+    NSLog(@"%f", [currentRemote currentSongRating]);
+    NSLog(@"%f", (float)[sender tag] / 100.0);
+    [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
+}
+
+//
+//
+// Plugin independent selectors
+//
+//
+- (void)quitMenuTunes:(id)sender
+{
+    [NSApp terminate:self];

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


@@ -806,16 +865,27 @@ isEqualToString:@"rewinding"]) {
     }
 }
 
     }
 }
 

-

 - (void)closePreferences
 {
 - (void)closePreferences
 {

-    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) {
+    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


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

-    NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
-    if (!statusController && [trackName length]) {
+    NSString *trackName = [currentRemote currentSongTitle];
+    if (!statusWindow && [trackName length]) {

         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
         
         if ([defaults boolForKey:@"showName"]) {
             if ([defaults boolForKey:@"showArtist"]) {
         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 +909,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 +917,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:


@@ -865,37 +935,36 @@ isEqualToString:@"rewinding"]) {
             }
         }
         
             }
         }
         

-        statusController = [[StatusWindowController alloc] init];
-        [statusController setTrackInfo:stringToShow];
+        [statusWindow setText:stringToShow];

         [NSTimer scheduledTimerWithTimeInterval:3.0
         [NSTimer scheduledTimerWithTimeInterval:3.0

-                                    target:self
-                                    selector:@selector(fadeAndCloseStatusWindow)
-                                    userInfo:nil
-                                    repeats:NO];
+                    target:self
+                    selector:@selector(fadeAndCloseStatusWindow)
+                    userInfo:nil
+                    repeats:NO];

     }
 }
 
 - (void)showUpcomingSongs
 {
     }
 }
 
 - (void)showUpcomingSongs
 {

-    if (!statusController) {
-        int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
+    int curPlaylist = [currentRemote currentPlaylistIndex];
+    if (!statusWindow) {
+        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 = @"";
             
             int i;
             NSString *songs = @"";
             

-            statusController = [[StatusWindowController alloc] init];
+            statusWindow = [ITTransientStatusWindow sharedWindow];

             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];

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

-            [statusController setUpcomingSongs:songs];
+            [statusWindow setText:songs];

             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)
             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)


@@ -907,9 +976,7 @@ isEqualToString:@"rewinding"]) {
 
 - (void)fadeAndCloseStatusWindow
 {
 
 - (void)fadeAndCloseStatusWindow
 {

-    [statusController fadeWindowOut];
-    [statusController release];
-    statusController = nil;
+    [statusWindow orderOut:self];

 }
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
 }
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers


@@ -926,10 +993,8 @@ isEqualToString:@"rewinding"]) {
         { shiftKey, NSShiftKeyMask },
     };
     
         { shiftKey, NSShiftKeyMask },
     };
     

-    for (i = 0; i < 6; i++)
-    {
-        if (modifiers & carbonToCocoa[i][0])
-        {
+    for (i = 0; i < 6; i++) {
+        if (modifiers & carbonToCocoa[i][0]) {

             cocoaModifiers += carbonToCocoa[i][1];
         }
     }
             cocoaModifiers += carbonToCocoa[i][1];
         }
     }


@@ -939,24 +1004,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 +1092,7 @@ isEqualToString:@"rewinding"]) {
         break;
         
         case 115:
         break;
         
         case 115:

+            charcode = NSHomeFunctionKey;

         break;
         
         case 116:
         break;
         
         case 116:


@@ -1069,7 +1150,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]];
     }
 }


@@ -1095,13 +1176,14 @@ isEqualToString:@"rewinding"]) {
 {
     if (refreshTimer) {
         [refreshTimer invalidate];
 {
     if (refreshTimer) {
         [refreshTimer invalidate];

+        [refreshTimer release];

         refreshTimer = nil;
     }
         refreshTimer = nil;
     }

-    CloseComponent(asComponent);
+    [currentRemote halt];

     [statusItem release];
     [menu release];
 //  [view release];
     [super dealloc];
 }
 
     [statusItem release];
     [menu release];
 //  [view release];
     [super dealloc];
 }
 

-@end
\ No newline at end of file
+@end