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

[MenuTunes.git] / iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 3381cb3..e286598 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -7,17 +7,17 @@
     return [[[iTunesRemote alloc] init] autorelease];
 }
 
     return [[[iTunesRemote alloc] init] autorelease];
 }
 

-- (NSString *)title
+- (NSString *)remoteTitle

 {
 {

-    return @"iTunes Plug-in";
+    return @"iTunes Remote";

 }
 
 }
 

-- (NSString *)information;
+- (NSString *)remoteInformation

 {
 {

-    return @"Default MenuTunes plugin to control iTunes.";
+    return @"Default MenuTunes plugin to control iTunes, by iThink Software.";

 }
 
 }
 

-- (NSImage *)icon
+- (NSImage *)remoteIcon

 {
     return nil;
 }
 {
     return nil;
 }


@@ -25,260 +25,344 @@
 - (BOOL)begin
 {
     iTunesPSN = [self iTunesPSN];
 - (BOOL)begin
 {
     iTunesPSN = [self iTunesPSN];

-    asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);

     
     

-    //Register for application termination in NSWorkspace

     [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
     [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
     
     [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
     [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
     

-    NSLog(@"iTunes Plugin loaded");

     return YES;
 }
 
 - (BOOL)halt
 {
     iTunesPSN.highLongOfPSN = kNoProcess;
     return YES;
 }
 
 - (BOOL)halt
 {
     iTunesPSN.highLongOfPSN = kNoProcess;

-    CloseComponent(asComponent);
-    
+

     //Unregister for application termination in NSWorkspace
     [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
     //Unregister for application termination in NSWorkspace
     [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];

-    
+

     return YES;
 }
 
     return YES;
 }
 

-- (void)applicationLaunched:(NSNotification *)note
+- (NSString *)playerFullName

 {
 {

-    NSDictionary *info = [note userInfo];
-    
-    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
-        iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
-        iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
-        
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidLaunchNotification" object:nil];
-    }
+    return @"iTunes";

 }
 
 }
 

-- (void)applicationTerminated:(NSNotification *)note
+- (NSString *)playerSimpleName

 {
 {

-    NSDictionary *info = [note userInfo];
+    return @"iTunes";
+}
+
+- (NSDictionary *)capabilities
+{
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+                [NSNumber numberWithBool: YES], @"Remote",
+                [NSNumber numberWithBool: YES], @"Basic Track Control",
+                [NSNumber numberWithBool: YES], @"Track Information",
+                [NSNumber numberWithBool: YES], @"Track Navigation",
+                [NSNumber numberWithBool: YES], @"Upcoming Songs",
+                [NSNumber numberWithBool: YES], @"Playlists",
+                [NSNumber numberWithBool: YES], @"Volume",
+                [NSNumber numberWithBool: YES], @"Shuffle",
+                [NSNumber numberWithBool: YES], @"Repeat Modes",
+                [NSNumber numberWithBool: YES], @"Equalizer",
+                [NSNumber numberWithBool: YES], @"Track Rating",
+                nil];
+}
+
+- (BOOL)showPrimaryInterface
+{
+    return NO;
+}
+
+- (ITMTRemotePlayerRunningState)playerRunningState
+{
+    NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
+    int i;
+    int count = [apps count];

     
     

-    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
-        iTunesPSN.highLongOfPSN = kNoProcess;
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    for (i = 0; i < count; i++) {
+        if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+            return ITMTRemotePlayerRunning;
+        }

     }
     }

+    return ITMTRemotePlayerNotRunning;

 }
 
 }
 

-- (PlayerState)playerState
+- (ITMTRemotePlayerPlayingState)playerPlayingState

 {
 {

-    NSString *result = [self runScriptAndReturnResult:@"get player state"];
+    long result = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

     
     

-    if ([result isEqualToString:@"playing"]) {
-        return playing;
-    } else if ([result isEqualToString:@"paused"]) {
-        return paused;
-    } else if ([result isEqualToString:@"stopped"]) {
-        return stopped;
-    } else if ([result isEqualToString:@"rewinding"]) {
-        return rewinding;
-    } else if ([result isEqualToString:@"fast forwarding"]) {
-        return forwarding;
+    switch (result)
+    {
+        default:
+        case 'kPSS':
+            return ITMTRemotePlayerStopped;
+        case 'kPSP':
+            return ITMTRemotePlayerPlaying;
+        case 'kPSp':
+            return ITMTRemotePlayerPaused;
+        case 'kPSR':
+            return ITMTRemotePlayerRewinding;
+        case 'kPSF':
+            return ITMTRemotePlayerForwarding;

     }
     
     }
     

-    return stopped;
+    return ITMTRemotePlayerStopped;

 }
 
 - (NSArray *)playlists
 {
 }
 
 - (NSArray *)playlists
 {

-    int i;
-    int numPresets = [[self runScriptAndReturnResult:@"get number of playlists"] intValue];
-    NSMutableArray *presets = [[NSMutableArray alloc] init];
+    long i = 0;
+    const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:iTunesPSN];
+    NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:numPlaylists];

     
     

-    for (i = 0; i < numPresets; i++) {
-        [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of playlist %i", i]]];
+    for (i = 1; i <= numPlaylists; i++) {
+        const long j = i;
+        NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%lu), from:'null'() } }",(unsigned long)j];
+        NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+        [playlists addObject:theObj];

     }
     }

-    
-    return [NSArray arrayWithArray:presets];
+    return [playlists autorelease];

 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {

-    NSString *result = [self runScriptAndReturnResult:[NSString stringWithFormat:@"get number of tracks in playlist %i", index]];
-    return [result intValue];
+    return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cTrk'), '----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:'null'() }",index] eventClass:@"core" eventID:@"cnte" appPSN:iTunesPSN];

 }
 
 }
 

-- (NSString *)classOfPlaylistAtIndex:(int)index
+- (ITMTRemotePlayerPlaylistClass)classOfPlaylistAtIndex:(int)index

 {
 {

-    //Not working yet. It returns the 4 character code instead of a name.
-    /*NSString *result;
-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKey:@"pcls"
-                fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];*/
-    NSString *result = [self runScriptAndReturnResult:[NSString stringWithFormat:@"get class of playlist %i", index]];
-    return result;
+    int realResult = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    
+
+    switch (realResult)
+          {
+          case 'cLiP':
+                 return ITMTRemotePlayerLibraryPlaylist;
+                 break;
+          case 'cRTP':
+                 return ITMTRemotePlayerRadioPlaylist;
+                 break;
+          default:
+                 return ITMTRemotePlayerPlaylist;
+          }

 }
 
 - (int)currentPlaylistIndex
 {
 }
 
 - (int)currentPlaylistIndex
 {

-    int result;
-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
-    return result;
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)songTitleAtIndex:(int)index
 {
 }
 
 - (NSString *)songTitleAtIndex:(int)index
 {

-    NSString *result = [self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of track %i of current playlist", index]];
-    return result;
+    return [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (int)currentSongIndex
 {
 }
 
 - (int)currentSongIndex
 {

-    int result;
-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
-    return result;
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongTitle
 {
 }
 
 - (NSString *)currentSongTitle
 {

-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongArtist
 {
 }
 
 - (NSString *)currentSongArtist
 {

-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongAlbum
 {
 }
 
 - (NSString *)currentSongAlbum
 {

-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongGenre
 {
 }
 
 - (NSString *)currentSongGenre
 {

-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongLength
 {
 }
 
 - (NSString *)currentSongLength
 {

-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

 }
 
 - (NSString *)currentSongRemaining
 {
     long duration = [[ITAppleEventCenter sharedCenter]
 }
 
 - (NSString *)currentSongRemaining
 {
     long duration = [[ITAppleEventCenter sharedCenter]

-                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur"
-                        fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                        appPSN:[self iTunesPSN]];
+                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];

     long current = [[ITAppleEventCenter sharedCenter]
     long current = [[ITAppleEventCenter sharedCenter]

-                        sendAEWithRequestedKeyForNumber:@"pPos"
-                        eventClass:@"core" eventID:@"getd"
-                        appPSN:[self iTunesPSN]];
-    
+                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+

     return [[NSNumber numberWithLong:duration - current] stringValue];
 }
 
     return [[NSNumber numberWithLong:duration - current] stringValue];
 }
 

-- (NSArray *)eqPresets;
+- (float)currentSongRating
+{
+    return [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pRte" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN] / 100;
+}
+
+- (BOOL)setCurrentSongRating:(float)rating
+{
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu) ----:obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }",(long)rating*100] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    return YES;
+}
+
+- (BOOL)equalizerEnabled
+{
+    return [[ITAppleEventCenter sharedCenter]
+                        sendAEWithRequestedKeyForNumber:@"pEQ " eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+}
+
+- (BOOL)setEqualizerEnabled:(BOOL)enabled
+{
+[[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu) ----:obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",enabled] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+}
+
+- (NSArray *)eqPresets

 {
     int i;
 {
     int i;

-    int numPresets = [[self runScriptAndReturnResult:@"get number of EQ presets"] intValue];
-    NSMutableArray *presets = [[NSMutableArray alloc] init];
+    long numPresets = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cEQP'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:iTunesPSN];
+    NSMutableArray *presets = [[NSMutableArray alloc] initWithCapacity:numPresets];

     
     

-    for (i = 0; i < numPresets; i++) {
-        [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of EQ preset %i", i]]];
+    for (i = 1; i <= numPresets; i++) {
+        NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() } }",i] eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+        if (theObj) {
+            [presets addObject:theObj];
+        }

     }
     }

-    
-    return [NSArray arrayWithArray:presets];
+    return [presets autorelease];

 }
 
 - (int)currentEQPresetIndex
 {
     int result;
     result = [[ITAppleEventCenter sharedCenter]
 }
 
 - (int)currentEQPresetIndex
 {
     int result;
     result = [[ITAppleEventCenter sharedCenter]

-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    return result;
+}
+
+- (float)volume
+{
+    long vol = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pVol" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    return vol / 100;
+}
+
+- (BOOL)setVolume:(float)volume
+{
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), ----:obj { form:'prop', want:type('prop'), seld:type('pVol'), from:'null'() }",(long)volume*100] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    return NO;
+}
+
+- (BOOL)shuffleEnabled
+{
+    int result = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pShf" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    return result;
+}
+
+- (BOOL)setShuffleEnabled:(BOOL)enabled
+{
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu) ----:obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",enabled] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+}
+
+- (ITMTRemotePlayerRepeatMode)repeatMode
+{
+    FourCharCode m00f;
+    int result;
+    m00f = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pRpt" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+
+    switch (m00f)
+          {
+          case 'kRp0':
+                 result = ITMTRemotePlayerRepeatOff;
+                 break;
+          case 'kRp1':
+                 result = ITMTRemotePlayerRepeatOne;
+                 break;
+          case 'kRpA':
+                 result = ITMTRemotePlayerRepeatAll;
+                 break;
+          }
+    

     return result;
 }
 
     return result;
 }
 

+- (BOOL)setRepeatMode:(ITMTRemotePlayerRepeatMode)repeatMode
+{
+    FourCharCode m00f;
+    switch (repeatMode)
+          {
+          case ITMTRemotePlayerRepeatOff:
+                 m00f = 'kRp0';
+                 break;
+          case ITMTRemotePlayerRepeatOne:
+                 m00f = 'kRp1';
+                 break;
+          case ITMTRemotePlayerRepeatAll:
+                 m00f = 'kRpA';
+                 break;
+          }
+
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu) ----:obj { form:'prop', want:type('pRpt'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",m00f] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+
+}
+

 - (BOOL)play
 {
 - (BOOL)play
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play" appPSN:iTunesPSN];

     return YES;
 }
 
 - (BOOL)pause
 {
     return YES;
 }
 
 - (BOOL)pause
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus" appPSN:iTunesPSN];

     return YES;
 }
 
 - (BOOL)goToNextSong
 {
     return YES;
 }
 
 - (BOOL)goToNextSong
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next" appPSN:iTunesPSN];

     return YES;
 }
 
 - (BOOL)goToPreviousSong
 {
     return YES;
 }
 
 - (BOOL)goToPreviousSong
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev" appPSN:iTunesPSN];

     return YES;
 }
 
     return YES;
 }
 

-- (BOOL)fastForward
+- (BOOL)forward

 {
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast" appPSN:iTunesPSN];

     return YES;
 }
 
 - (BOOL)rewind
 {
     return YES;
 }
 
 - (BOOL)rewind
 {

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd"
-            appPSN:[self iTunesPSN]];
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd" appPSN:iTunesPSN];

     return YES;
 }
 
     return YES;
 }
 

-

 - (BOOL)switchToPlaylistAtIndex:(int)index
 {
 - (BOOL)switchToPlaylistAtIndex:(int)index
 {

-    [self runScriptAndReturnResult:[NSString stringWithFormat:
-        @"play playlist %i", index]];
-    return NO;
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }",index] eventClass:@"hook" eventID:@"Play" appPSN:iTunesPSN];
+    return YES;

 }
 
 - (BOOL)switchToSongAtIndex:(int)index
 {
 }
 
 - (BOOL)switchToSongAtIndex:(int)index
 {

-    [self runScriptAndReturnResult:[NSString stringWithFormat:
-        @"play track %i of current playlist", index]];
-    return NO;
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }",index] eventClass:@"hook" eventID:@"Play" appPSN:iTunesPSN];
+    return YES;

 }
 
 - (BOOL)switchToEQAtIndex:(int)index
 {
 }
 
 - (BOOL)switchToEQAtIndex:(int)index
 {

-    [self runScriptAndReturnResult:[NSString stringWithFormat:
-        @"set current EQ preset to EQ preset %i", index]];
-    [self runScriptAndReturnResult:@"set EQ enabled to 1"];
-    return NO;
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:obj { form:'ID  ', want:type('cEQP'), seld:long(%lu), from:'null'() }, ----:obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() }",index] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    return YES;

 }
 
 - (ProcessSerialNumber)iTunesPSN
 }
 
 - (ProcessSerialNumber)iTunesPSN


@@ -286,51 +370,45 @@
     NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     ProcessSerialNumber number;
     int i;
     NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     ProcessSerialNumber number;
     int i;

+    int count = [apps count];

     
     number.highLongOfPSN = kNoProcess;
     
     
     number.highLongOfPSN = kNoProcess;
     

-    for (i = 0; i < [apps count]; i++)
+    for (i = 0; i < count; i++)

     {
         NSDictionary *curApp = [apps objectAtIndex:i];
         
         if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"])
         {
     {
         NSDictionary *curApp = [apps objectAtIndex:i];
         
         if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"])
         {

-            number.highLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberHigh"] intValue];
-            number.lowLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberLow"] intValue];
+            number.highLongOfPSN = [[curApp objectForKey:
+                @"NSApplicationProcessSerialNumberHigh"] intValue];
+            number.lowLongOfPSN = [[curApp objectForKey:
+                @"NSApplicationProcessSerialNumberLow"] intValue];

         }
     }
     return number;
 }
 
         }
     }
     return number;
 }
 

-- (NSString *)runScriptAndReturnResult:(NSString *)script
+- (void)applicationLaunched:(NSNotification *)note

 {
 {

-    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)];
+    NSDictionary *info = [note userInfo];
+
+    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+        iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
+        iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
+
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+    }
+}
+
+- (void)applicationTerminated:(NSNotification *)note
+{
+    NSDictionary *info = [note userInfo];
+
+    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+        iTunesPSN.highLongOfPSN = kNoProcess;
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil];

     }
     }

-    free(buffer);
-    buffer = nil;
-    return result;

 }
 
 @end
 }
 
 @end