Updating previous track to work like iTunes, that is, if you're well into

[MenuTunes.git] / iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 997922c..a5e45be 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -69,19 +69,19 @@
     if ([self playerRunningState] == ITMTRemotePlayerRunning) {
         ITDebugLog(@"Showing player interface.");
         //If not minimized and visible
     if ([self playerRunningState] == ITMTRemotePlayerRunning) {
         ITDebugLog(@"Showing player interface.");
         //If not minimized and visible

-        if ( ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] == 0) &&
-             ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] != 0) &&
+        if ( ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue] == 0) &&
+                        ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue] != 0) &&

              [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) {
             //set minimized of browser window 1 to true
              [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) {
             //set minimized of browser window 1 to true

-            [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+                       ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         } else {
             //set minimized of browser window 1 to false
         } else {
             //set minimized of browser window 1 to false

-            [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+                       ITSendAEWithString(@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         }
         //set visible of browser window 1 to true
         }
         //set visible of browser window 1 to true

-        [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+               ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         //active iTunes
         //active iTunes

-        [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+               ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }", 'core', 'setd', &savedPSN);

         ITDebugLog(@"Done showing player primary interface.");
         return YES;
     } else {
         ITDebugLog(@"Done showing player primary interface.");
         return YES;
     } else {


@@ -117,12 +117,10 @@
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {

-    long result;
+    SInt32 result;

     
     ITDebugLog(@"Getting player playing state");
     
     ITDebugLog(@"Getting player playing state");

-    
-    result = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-    
+    result = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }", 'core', 'getd', &savedPSN) int32Value];

     switch (result)
     {
         case 'kPSP':
     switch (result)
     {
         case 'kPSP':


@@ -165,20 +163,21 @@
 - (NSArray *)playlists
 {
     unsigned long i, k;
 - (NSArray *)playlists
 {
     unsigned long i, k;

-    const signed long numSources = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cSrc'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
+    SInt32 numSources = [ITSendAEWithString(@"kocl:type('cSrc'), '----':()", 'core', 'cnte', &savedPSN) int32Value];

     NSMutableArray *allSources = [[NSMutableArray alloc] init];
     
     ITDebugLog(@"Getting playlists.");
     if (numSources == 0) {
     NSMutableArray *allSources = [[NSMutableArray alloc] init];
     
     ITDebugLog(@"Getting playlists.");
     if (numSources == 0) {

+               [allSources release];

         ITDebugLog(@"No sources.");
         return nil;
     }
     
     for (k = 1; k <= numSources ; k++) {
         ITDebugLog(@"No sources.");
         return nil;
     }
     
     for (k = 1; k <= numSources ; k++) {

-        const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cPly'), '----':obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() }",k] eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];;
-        unsigned long fourcc = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-        NSString *sourceName = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-        unsigned long index = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        SInt32 numPlaylists = [ITSendAEWithString([NSString stringWithFormat:@"kocl:type('cPly'), '----':obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() }",k], 'core', 'cnte', &savedPSN) int32Value];
+        SInt32 fourcc = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) int32Value];
+        NSString *sourceName = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) stringValue];
+        SInt32 index = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) int32Value];

         unsigned long class;
         if (sourceName) {
             NSMutableArray *aSource = [[NSMutableArray alloc] init];
         unsigned long class;
         if (sourceName) {
             NSMutableArray *aSource = [[NSMutableArray alloc] init];


@@ -211,7 +210,7 @@
             [aSource addObject:[NSNumber numberWithInt:index]];
             for (i = 1; i <= numPlaylists; i++) {
                 NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%u), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } } }",i,k];
             [aSource addObject:[NSNumber numberWithInt:index]];
             for (i = 1; i <= numPlaylists; i++) {
                 NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%u), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } } }",i,k];

-                NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+                NSString *theObj = [ITSendAEWithString(sendStr, 'core', 'getd', &savedPSN) stringValue];

                 ITDebugLog(@" - Adding playlist %@", theObj);
                 if (theObj) {
                     [aSource addObject:theObj];
                 ITDebugLog(@" - Adding playlist %@", theObj);
                 if (theObj) {
                     [aSource addObject:theObj];


@@ -264,20 +263,30 @@
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {

+       /*
+               This method only returns the proper number if there's something playing.
+               This is because it gets the container of the current playlist so that it
+               gets the playlist index from the current source. Operating this way is fine,
+               since MT only ever calls this method when there is something playlist.
+               A working version of this that works in just the main source is in the
+               makePlaylistWithTerm:ofType: method.
+       */

     int temp1;
     int temp1;

+       NSAppleEventDescriptor *result;

     ITDebugLog(@"Getting number of songs in playlist at index %i", index);
     ITDebugLog(@"Getting number of songs in playlist at index %i", index);

-    temp1 = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cTrk'), '----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
+       result = ITSendAEWithString([NSString stringWithFormat:@"kocl:type('cTrk'), '----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", index], 'core', 'cnte', &savedPSN);
+       temp1 = (result == nil) ? -1 : (int)[result int32Value];

     ITDebugLog(@"Getting number of songs in playlist at index %i done", index);
     return temp1;
 }
 
 - (ITMTRemotePlayerSource)currentSource
 {
     ITDebugLog(@"Getting number of songs in playlist at index %i done", index);
     return temp1;
 }
 
 - (ITMTRemotePlayerSource)currentSource
 {

-    unsigned long fourcc;
+    SInt32 fourcc;

 
     ITDebugLog(@"Getting current source.");   
     
 
     ITDebugLog(@"Getting current source.");   
     

-    fourcc = (unsigned long)[[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber :[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }"] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    fourcc = ([self isPlaying]) ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", 'core', 'getd', &savedPSN) int32Value] : 'kLib';

     
     switch (fourcc) {
         case 'kTun':
     
     switch (fourcc) {
         case 'kTun':


@@ -311,15 +320,15 @@
 
 - (int)currentSourceIndex
 {
 
 - (int)currentSourceIndex
 {

-    ITDebugLog(@"Getting current source.");   
-    return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }"] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current source.");
+    return [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", 'core', 'getd', &savedPSN) int32Value];

 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {

-    int realResult;
+    SInt32 realResult;

     ITDebugLog(@"Getting current playlist class");
     ITDebugLog(@"Getting current playlist class");

-    realResult = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    realResult = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     switch (realResult)
           {
           case 'cLiP':
     switch (realResult)
           {
           case 'cLiP':


@@ -340,7 +349,7 @@
 {  
     int temp1;
     ITDebugLog(@"Getting current playlist index.");
 {  
     int temp1;
     ITDebugLog(@"Getting current playlist index.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = ([self isPlaying] ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] : -1);

     ITDebugLog(@"Getting current playlist index done.");
     return temp1;
 }
     ITDebugLog(@"Getting current playlist index done.");
     return temp1;
 }


@@ -349,7 +358,7 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting song title at index %i.", index);
 {
     NSString *temp1;
     ITDebugLog(@"Getting song title at index %i.", index);

-    temp1 = [[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:savedPSN];
+    temp1 = [ITSendAEWithString([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], 'core', 'getd', &savedPSN) stringValue];

     ITDebugLog(@"Getting song title at index %i done.", index);
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }
     ITDebugLog(@"Getting song title at index %i done.", index);
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }


@@ -358,7 +367,7 @@
 {
     int temp1;
     ITDebugLog(@"Getting current album track count.");
 {
     int temp1;
     ITDebugLog(@"Getting current album track count.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTrC'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
     ITDebugLog(@"Getting current album track count done.");
     return temp1;
     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
     ITDebugLog(@"Getting current album track count done.");
     return temp1;


@@ -368,7 +377,7 @@
 {
     int temp1;
     ITDebugLog(@"Getting current song track.");
 {
     int temp1;
     ITDebugLog(@"Getting current song track.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrN" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTrN'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
     ITDebugLog(@"Getting current song track done.");
     return temp1;
     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
     ITDebugLog(@"Getting current song track done.");
     return temp1;


@@ -378,11 +387,19 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current unique identifier.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current unique identifier.");

-    int cls = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+       NSAppleEventDescriptor *descriptor = ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN);
+       if ((descriptor == nil) || ([descriptor int32Value] == 'prop')) {
+               return @"0-0";
+       }
+    SInt32 cls = [descriptor int32Value];

     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (cls == 'cURT') ) {
     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (cls == 'cURT') ) {

-        temp1 = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKey:@"pStT" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+               NSString *bad = [NSString stringWithUTF8String:"浳湧"];
+        temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
+        if ([temp1 isEqualToString:bad]) {
+            temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+        }

     } else {
     } else {

-        temp1 = [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pDID" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN]];
+        temp1 = [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pDID'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value]];

     }
     ITDebugLog(@"Getting current unique identifier done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
     }
     ITDebugLog(@"Getting current unique identifier done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;


@@ -392,7 +409,7 @@
 {
     int temp1;
     ITDebugLog(@"Getting current song index.");
 {
     int temp1;
     ITDebugLog(@"Getting current song index.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+       temp1 = ([self isPlaying] ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] : -1);

     ITDebugLog(@"Getting current song index done.");
     return temp1;
 }
     ITDebugLog(@"Getting current song index done.");
     return temp1;
 }


@@ -401,17 +418,20 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song title.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song title.");

-    
+    SInt32 result = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+       

     //If we're listening to the radio.
     //If we're listening to the radio.

-    if ([[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] == 'cURT') {
+    if (result == 'cURT') {

         NSString *bad = [NSString stringWithUTF8String:"浳湧"];
         NSString *bad = [NSString stringWithUTF8String:"浳湧"];

-        temp1 = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKey:@"pStT" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];

         if ([temp1 isEqualToString:bad]) {
         if ([temp1 isEqualToString:bad]) {

-            temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+            temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

         }
         temp1 = [temp1 stringByAppendingString:@" (Stream)"];
         }
         temp1 = [temp1 stringByAppendingString:@" (Stream)"];

-    } else {
-        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    } else if (result == 'prop') {
+               temp1 = nil;
+       } else {
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     }
     ITDebugLog(@"Getting current song title done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
     }
     ITDebugLog(@"Getting current song title done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;


@@ -422,7 +442,7 @@
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {

-        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pArt'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     } else {
         temp1 = @"";
     }
     } else {
         temp1 = @"";
     }


@@ -435,7 +455,7 @@
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {

-        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pCmp" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pCmp'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     } else {
         temp1 = @"";
     }
     } else {
         temp1 = @"";
     }


@@ -448,7 +468,7 @@
     NSString *temp1;
     ITDebugLog(@"Getting current song album.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
     NSString *temp1;
     ITDebugLog(@"Getting current song album.");
     if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {

-        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pAlb'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     } else {
         temp1 = @"";
     }
     } else {
         temp1 = @"";
     }


@@ -460,18 +480,18 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song genre.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song genre.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pGen'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     ITDebugLog(@"Getting current song genre done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongLength
 {
     ITDebugLog(@"Getting current song genre done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongLength
 {

-    int temp1;
+    SInt32 temp1;

     NSString *temp2;
     ITDebugLog(@"Getting current song length.");
     NSString *temp2;
     ITDebugLog(@"Getting current song length.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-    temp2 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    temp2 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTim'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];

     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (temp1 == 'cURT') ) { temp2 = @"Continuous"; }
     ITDebugLog(@"Getting current song length done.");
     return temp2;
     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (temp1 == 'cURT') ) { temp2 = @"Continuous"; }
     ITDebugLog(@"Getting current song length done.");
     return temp2;


@@ -479,18 +499,13 @@
 
 - (NSString *)currentSongRemaining
 {
 
 - (NSString *)currentSongRemaining
 {

-    long duration;
-    long current;
-    long final;
+    SInt32 duration, current, final;

     NSString *finalString;
     
     ITDebugLog(@"Getting current song remaining time.");
     
     NSString *finalString;
     
     ITDebugLog(@"Getting current song remaining time.");
     

-    duration = [[ITAppleEventCenter sharedCenter]
-                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-    current = [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-                        
+    duration = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pDur'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    current = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPos'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     final = duration - current;
     finalString = [self formatTimeInSeconds:final];
     
     final = duration - current;
     finalString = [self formatTimeInSeconds:final];
     


@@ -507,10 +522,7 @@
     NSString *finalString;
     
     ITDebugLog(@"Getting current song elapsed time.");
     NSString *finalString;
     
     ITDebugLog(@"Getting current song elapsed time.");

-    
-    final = [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
-                        
+       final = (long)[ITSendAEWithKey('pPos', 'core', 'getd', &savedPSN) int32Value];

     finalString = [self formatTimeInSeconds:final];
     ITDebugLog(@"Getting current song elapsed time done.");
     return finalString;
     finalString = [self formatTimeInSeconds:final];
     ITDebugLog(@"Getting current song elapsed time done.");
     return finalString;


@@ -519,7 +531,7 @@
 - (NSImage *)currentSongAlbumArt
 {
     ITDebugLog(@"Getting current song album art.");
 - (NSImage *)currentSongAlbumArt
 {
     ITDebugLog(@"Getting current song album art.");

-    NSData *data = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForData:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPCT'), from:obj { form:'indx', want:type('cArt'), seld:long(1), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    NSData *data = ([self isPlaying]) ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPCT'), from:obj { form:'indx', want:type('cArt'), seld:long(1), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } } }", 'core', 'getd', &savedPSN) data] : nil;

     ITDebugLog(@"Getting current song album art done.");    
     if (data) {
         return [[[NSImage alloc] initWithData:data] autorelease];
     ITDebugLog(@"Getting current song album art done.");    
     if (data) {
         return [[[NSImage alloc] initWithData:data] autorelease];


@@ -532,7 +544,7 @@
 {
     int count;
     ITDebugLog(@"Getting current song play count.");
 {
     int count;
     ITDebugLog(@"Getting current song play count.");

-    count = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pPlC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    count = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlC'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     ITDebugLog(@"Getting current song play count done.");
     return count;
 }
     ITDebugLog(@"Getting current song play count done.");
     return count;
 }


@@ -541,9 +553,7 @@
 {
     float temp1;
     ITDebugLog(@"Getting current song rating.");
 {
     float temp1;
     ITDebugLog(@"Getting current song rating.");

-    temp1 = ((float)[[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pRte" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] / 100.0);
-    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = -1.0; }
+    temp1 = (![self isPlaying] || ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist)) ? -1.0 : ((float)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] / 100.0);

     ITDebugLog(@"Getting current song rating done.");
     return temp1;
 }
     ITDebugLog(@"Getting current song rating done.");
     return temp1;
 }


@@ -552,7 +562,7 @@
 {
     ITDebugLog(@"Setting current song rating to %f.", rating);
     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { return NO; }
 {
     ITDebugLog(@"Setting current song rating to %f.", rating);
     if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { return NO; }

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",(long)(rating*100),[self currentSongIndex]] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",(long)(rating*100), [self currentSongIndex]], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Setting current song rating to %f done.", rating);
     return YES;
 }
     ITDebugLog(@"Setting current song rating to %f done.", rating);
     return YES;
 }


@@ -560,7 +570,7 @@
 - (BOOL)equalizerEnabled
 {
     ITDebugLog(@"Getting equalizer enabled status.");
 - (BOOL)equalizerEnabled
 {
     ITDebugLog(@"Getting equalizer enabled status.");

-    int thingy = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pEQ " eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    int thingy = (int)[ITSendAEWithKey('pEQ ', 'core', 'getd', &savedPSN) int32Value];

     ITDebugLog(@"Done getting equalizer enabled status.");
     return (thingy != 0) ? YES : NO;
 }
     ITDebugLog(@"Done getting equalizer enabled status.");
     return (thingy != 0) ? YES : NO;
 }


@@ -568,7 +578,7 @@
 - (BOOL)setEqualizerEnabled:(BOOL)enabled
 {
     ITDebugLog(@"Setting equalizer enabled to %i.", enabled);
 - (BOOL)setEqualizerEnabled:(BOOL)enabled
 {
     ITDebugLog(@"Setting equalizer enabled to %i.", enabled);

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:'null'() }",enabled] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:'null'() }", enabled], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Done setting equalizer enabled to %i.", enabled);
     return YES;
 }
     ITDebugLog(@"Done setting equalizer enabled to %i.", enabled);
     return YES;
 }


@@ -576,11 +586,11 @@
 - (NSArray *)eqPresets
 {
     int i;
 - (NSArray *)eqPresets
 {
     int i;

-    long numPresets = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cEQP'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
+    SInt32 numPresets = [ITSendAEWithString(@"kocl:type('cEQP'), '----':(), &subj:()", 'core', 'cnte', &savedPSN) int32Value];

     NSMutableArray *presets = [[NSMutableArray alloc] initWithCapacity:numPresets];
     ITDebugLog(@"Getting EQ presets");
     for (i = 1; i <= numPresets; i++) {
     NSMutableArray *presets = [[NSMutableArray alloc] initWithCapacity:numPresets];
     ITDebugLog(@"Getting EQ presets");
     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:savedPSN];
+        NSString *theObj = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() } }", i], 'core', 'getd', &savedPSN) stringValue];

         if (theObj) {
             ITDebugLog(@"Adding preset %@", theObj);
             [presets addObject:theObj];
         if (theObj) {
             ITDebugLog(@"Adding preset %@", theObj);
             [presets addObject:theObj];


@@ -594,8 +604,7 @@
 {
     int result;
     ITDebugLog(@"Getting current EQ preset index.");
 {
     int result;
     ITDebugLog(@"Getting current EQ preset index.");

-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    result = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     ITDebugLog(@"Getting current EQ preset index done.");
     return result;
 }
     ITDebugLog(@"Getting current EQ preset index done.");
     return result;
 }


@@ -604,13 +613,13 @@
 {
     ITDebugLog(@"Getting volume.");
     ITDebugLog(@"Getting volume done.");
 {
     ITDebugLog(@"Getting volume.");
     ITDebugLog(@"Getting volume done.");

-    return (float)[[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pVol" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] / 100;
+    return (float)[ITSendAEWithKey('pVol', 'core', 'getd', &savedPSN) int32Value] / 100;

 }
 
 - (BOOL)setVolume:(float)volume
 {
     ITDebugLog(@"Setting volume to %f.", volume);
 }
 
 - (BOOL)setVolume:(float)volume
 {
     ITDebugLog(@"Setting volume to %f.", 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:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pVol'), from:'null'() }", (long)(volume * 100)], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Setting volume to %f done.", volume);
     return YES;
 }
     ITDebugLog(@"Setting volume to %f done.", volume);
     return YES;
 }


@@ -619,8 +628,7 @@
 {
     ITDebugLog(@"Getting shuffle enabled status.");
     BOOL final;
 {
     ITDebugLog(@"Getting shuffle enabled status.");
     BOOL final;

-    int result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pShf" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    int result = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('pPla'), seld:type('pEQP'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     if (result != 0) {
         final = YES;
     } else {
     if (result != 0) {
         final = YES;
     } else {


@@ -633,7 +641,7 @@
 - (BOOL)setShuffleEnabled:(BOOL)enabled
 {
     ITDebugLog(@"Set shuffle enabled to %i", enabled);
 - (BOOL)setShuffleEnabled:(BOOL)enabled
 {
     ITDebugLog(@"Set shuffle enabled to %i", 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'() } }",(unsigned long)enabled] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+       ITSendAEWithString([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'() } }", (unsigned long)enabled], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Set shuffle enabled to %i done", enabled);
     return YES;
 }
     ITDebugLog(@"Set shuffle enabled to %i done", enabled);
     return YES;
 }


@@ -642,8 +650,7 @@
 {
     FourCharCode m00f = 0;
     int result = 0;
 {
     FourCharCode m00f = 0;
     int result = 0;

-    m00f = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pRpt" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    m00f = (FourCharCode)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('pPla'), seld:type('pEQP'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];

     ITDebugLog(@"Getting repeat mode.");
     switch (m00f)
     {
     ITDebugLog(@"Getting repeat mode.");
     switch (m00f)
     {


@@ -682,7 +689,7 @@
             m00f = "kRp0";
             break;
     }
             m00f = "kRp0";
             break;
     }

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:'%s', '----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }",m00f] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"data:'%s', '----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }", m00f], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Setting repeat mode to %c done", m00f);
     return YES;
 }
     ITDebugLog(@"Setting repeat mode to %c done", m00f);
     return YES;
 }


@@ -690,7 +697,7 @@
 - (BOOL)play
 {
     ITDebugLog(@"Play");
 - (BOOL)play
 {
     ITDebugLog(@"Play");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play" appPSN:savedPSN];
+       ITSendAE('hook', 'Play', &savedPSN);

     ITDebugLog(@"Play done");
     return YES;
 }
     ITDebugLog(@"Play done");
     return YES;
 }


@@ -698,7 +705,7 @@
 - (BOOL)pause
 {
     ITDebugLog(@"Pause");
 - (BOOL)pause
 {
     ITDebugLog(@"Pause");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus" appPSN:savedPSN];
+    ITSendAE('hook', 'Paus', &savedPSN);

     ITDebugLog(@"Pause done");
     return YES;
 }
     ITDebugLog(@"Pause done");
     return YES;
 }


@@ -706,7 +713,7 @@
 - (BOOL)goToNextSong
 {
     ITDebugLog(@"Go to next track");
 - (BOOL)goToNextSong
 {
     ITDebugLog(@"Go to next track");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next" appPSN:savedPSN];
+    ITSendAE('hook', 'Next', &savedPSN);

     ITDebugLog(@"Go to next track done");
     return YES;
 }
     ITDebugLog(@"Go to next track done");
     return YES;
 }


@@ -714,7 +721,7 @@
 - (BOOL)goToPreviousSong
 {
     ITDebugLog(@"Go to previous track");
 - (BOOL)goToPreviousSong
 {
     ITDebugLog(@"Go to previous track");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev" appPSN:savedPSN];
+    ITSendAE('hook', 'Back', &savedPSN);

     ITDebugLog(@"Go to previous track done");
     return YES;
 }
     ITDebugLog(@"Go to previous track done");
     return YES;
 }


@@ -722,7 +729,7 @@
 - (BOOL)forward
 {
     ITDebugLog(@"Fast forward action");
 - (BOOL)forward
 {
     ITDebugLog(@"Fast forward action");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast" appPSN:savedPSN];
+    ITSendAE('hook', 'Fast', &savedPSN);

     ITDebugLog(@"Fast forward action done");
     return YES;
 }
     ITDebugLog(@"Fast forward action done");
     return YES;
 }


@@ -730,7 +737,7 @@
 - (BOOL)rewind
 {
     ITDebugLog(@"Rewind action");
 - (BOOL)rewind
 {
     ITDebugLog(@"Rewind action");

-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd" appPSN:savedPSN];
+    ITSendAE('hook', 'Rwnd', &savedPSN);

     ITDebugLog(@"Rewind action done");
     return YES;
 }
     ITDebugLog(@"Rewind action done");
     return YES;
 }


@@ -738,7 +745,7 @@
 - (BOOL)switchToPlaylistAtIndex:(int)index
 {
     ITDebugLog(@"Switching to playlist at index %i", index);
 - (BOOL)switchToPlaylistAtIndex:(int)index
 {
     ITDebugLog(@"Switching to playlist at index %i", index);

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }", index] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }", index], 'hook', 'Play', &savedPSN);

     ITDebugLog(@"Done switching to playlist at index %i", index);
     return YES;
 }
     ITDebugLog(@"Done switching to playlist at index %i", index);
     return YES;
 }


@@ -746,8 +753,7 @@
 - (BOOL)switchToPlaylistAtIndex:(int)index ofSourceAtIndex:(int)index2
 {
     ITDebugLog(@"Switching to playlist at index %i of source %i", index, index2);
 - (BOOL)switchToPlaylistAtIndex:(int)index ofSourceAtIndex:(int)index2
 {
     ITDebugLog(@"Switching to playlist at index %i of source %i", index, index2);

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from: obj { form:'indx', want:type('cSrc'), seld:long(%lu), from:'null'() } }", index - 1, index2 + 1] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN];
-    //{ form:'indx', want:type('cPly'), seld:long(%lu), from:obj { form:'indx', want:type('cSrc'), seld:long('%lu'), from:'null'() } } -- obj { form:'indx', want:type('cSrc'), seld:long(1), from:'null'() }
+       ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from: obj { form:'indx', want:type('cSrc'), seld:long(%lu), from:'null'() } }", index - 1, index2 + 1], 'hook', 'Play', &savedPSN);

     ITDebugLog(@"Done switching to playlist at index %i of source %i", index, index2);
     return YES;
 }
     ITDebugLog(@"Done switching to playlist at index %i of source %i", index, index2);
     return YES;
 }


@@ -755,7 +761,7 @@
 - (BOOL)switchToSongAtIndex:(int)index
 {
     ITDebugLog(@"Switching to track at index %i", index);
 - (BOOL)switchToSongAtIndex:(int)index
 {
     ITDebugLog(@"Switching to track at index %i", index);

-    [[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:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }", index], 'hook' ,'Play', &savedPSN);

     ITDebugLog(@"Done switching to track at index %i", index);
     return YES;
 }
     ITDebugLog(@"Done switching to track at index %i", index);
     return YES;
 }


@@ -765,7 +771,7 @@
     ITDebugLog(@"Switching to EQ preset at index %i", index);
     // index should count from 0, but itunes counts from 1, so let's add 1.
     [self setEqualizerEnabled:YES];
     ITDebugLog(@"Switching to EQ preset at index %i", index);
     // index should count from 0, but itunes counts from 1, so let's add 1.
     [self setEqualizerEnabled:YES];

-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() }, data:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() }",(index+1)] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+       ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() }, data:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() }", (index+1)], 'core', 'setd', &savedPSN);

     ITDebugLog(@"Done switching to EQ preset at index %i", index);
     return YES;
 }
     ITDebugLog(@"Done switching to EQ preset at index %i", index);
     return YES;
 }


@@ -773,7 +779,7 @@
 - (BOOL)makePlaylistWithTerm:(NSString *)term ofType:(int)type
 {
     int i;
 - (BOOL)makePlaylistWithTerm:(NSString *)term ofType:(int)type
 {
     int i;

-    
+       

     //Get fixed indexing status
     BOOL fixed = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", 'core', 'getd', &savedPSN) booleanValue];
     
     //Get fixed indexing status
     BOOL fixed = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", 'core', 'getd', &savedPSN) booleanValue];
     


@@ -783,11 +789,17 @@
     //Search for the term
     NSAppleEventDescriptor *searchResults = ITSendAEWithString([NSString stringWithFormat:@"pTrm:\"%@\", pAre:'%@', '----':obj { form:'indx', want:type('cPly'), seld:long(1), from:obj { form:'indx', want:type('cSrc'), seld:long(1), from:'null'() } }", term, ((type == 1) ? @"kSrR" : @"kSrL")], 'hook', 'Srch', &savedPSN);
     
     //Search for the term
     NSAppleEventDescriptor *searchResults = ITSendAEWithString([NSString stringWithFormat:@"pTrm:\"%@\", pAre:'%@', '----':obj { form:'indx', want:type('cPly'), seld:long(1), from:obj { form:'indx', want:type('cSrc'), seld:long(1), from:'null'() } }", term, ((type == 1) ? @"kSrR" : @"kSrL")], 'hook', 'Srch', &savedPSN);
     

-    //Delete old MenuTunes playlist
-    ITSendAEWithString(@"'----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'delo', &savedPSN);
-    
-    //Create MenuTunes playlist
-    ITSendAEWithString(@"prdt:{ pnam:\"MenuTunes\" }, kocl:type('cPly'), &subj:()", 'core', 'crel', &savedPSN);
+    //If MenuTunes playlist exists
+    if ([ITSendAEWithString(@"'----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'doex', &savedPSN) booleanValue]) {
+        //Clear old MenuTunes playlist
+               int numSongs = [ITSendAEWithString(@"kocl:type('cTrk'), '----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'cnte', &savedPSN) int32Value];
+        for (i = 1; i <= numSongs; i++) {
+            ITSendAEWithString(@"'----':obj { form:'indx', want:type('cTrk'), seld:long(1), from:obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() } }", 'core', 'delo', &savedPSN);
+        }
+    } else {
+        //Create MenuTunes playlist
+        ITSendAEWithString(@"prdt:{ pnam:\"MenuTunes\" }, kocl:type('cPly'), &subj:()", 'core', 'crel', &savedPSN);
+    }

     
     //Duplicate search results to playlist
     for (i = 1; i <= [searchResults numberOfItems]; i++) {
     
     //Duplicate search results to playlist
     for (i = 1; i <= [searchResults numberOfItems]; i++) {


@@ -802,6 +814,11 @@
     return YES;
 }
 
     return YES;
 }
 

+- (BOOL)isPlaying
+{
+       return ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] != 'prop');
+}
+

 - (ProcessSerialNumber)iTunesPSN
 {
     /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
 - (ProcessSerialNumber)iTunesPSN
 {
     /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];