Converted one bit of AppleScripting to AEs

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 23e6094..74a3df8 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -25,27 +25,27 @@
 - (BOOL)begin
 {
     iTunesPSN = [self iTunesPSN];
-    
+
     //We won't need this once we're pure AEs
     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];
-    
+
     return YES;
 }
 
 - (BOOL)halt
 {
     iTunesPSN.highLongOfPSN = kNoProcess;
-    
+
     //We won't need this once we're pure AEs
     CloseComponent(asComponent);
-    
+
     //Unregister for application termination in NSWorkspace
     [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-    
+
     return YES;
 }
 
@@ -53,7 +53,7 @@
 {
     NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     int i,count = [apps count];
-    
+
     for (i = 0; i < count; i++) {
         if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"]
                 isEqualToString:@"iTunes"]) {
@@ -66,7 +66,7 @@
 - (PlayerState)playerState
 {
     NSString *result = [self runScriptAndReturnResult:@"get player state"];
-    
+
     if ([result isEqualToString:@"playing"]) {
         return playing;
     } else if ([result isEqualToString:@"paused"]) {
@@ -78,7 +78,7 @@
     } else if ([result isEqualToString:@"fast forwarding"]) {
         return forwarding;
     }
-    
+
     return stopped;
 }
 
@@ -90,7 +90,6 @@
     for (i = 1; i <= numPresets; i++) {
         [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of playlist %i", i]]];
     }
-    
     return [presets autorelease];
 }
 
@@ -103,13 +102,14 @@
 - (NSString *)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:[self iTunesPSN]];
+
+    //result = [self runScriptAndReturnResult:[NSString stringWithFormat:@"get class of playlist %i", index]];
+    if (realResult == 'cRTP') return @"radio tuner playlist";
+    else return @"playlist";
 }
 
 - (int)currentPlaylistIndex
@@ -117,8 +117,8 @@
     int result;
     result = [[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                           fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
+                                                                          appPSN:[self iTunesPSN]];
     return result;
 }
 
@@ -133,57 +133,57 @@
     int result;
     result = [[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                           fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                          appPSN:[self iTunesPSN]];
     return result;
 }
 
 - (NSString *)currentSongTitle
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                                                               fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                                           appPSN:[self iTunesPSN]];
 }
 
 - (NSString *)currentSongArtist
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                                                               fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                                           appPSN:[self iTunesPSN]];
 }
 
 - (NSString *)currentSongAlbum
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                                                               fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                                           appPSN:[self iTunesPSN]];
 }
 
 - (NSString *)currentSongGenre
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                                                               fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                                           appPSN:[self iTunesPSN]];
 }
 
 - (NSString *)currentSongLength
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim"
-                fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                                                               fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                                           appPSN:[self iTunesPSN]];
 }
 
 - (NSString *)currentSongRemaining
 {
     long duration = [[ITAppleEventCenter sharedCenter]
                         sendTwoTierAEWithRequestedKeyForNumber:@"pDur"
-                        fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
-                        appPSN:[self iTunesPSN]];
+                                                                         fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
+                                                                                        appPSN:[self iTunesPSN]];
     long current = [[ITAppleEventCenter sharedCenter]
                         sendAEWithRequestedKeyForNumber:@"pPos"
-                        eventClass:@"core" eventID:@"getd"
-                        appPSN:[self iTunesPSN]];
-    
+                                                                       eventClass:@"core" eventID:@"getd"
+                                                                           appPSN:[self iTunesPSN]];
+
     return [[NSNumber numberWithLong:duration - current] stringValue];
 }
 
@@ -192,11 +192,11 @@
     int i;
     int numPresets = [[self runScriptAndReturnResult:@"get number of EQ presets"] intValue];
     NSMutableArray *presets = [[NSMutableArray alloc] init];
-    
+
     for (i = 1; i <= numPresets; i++) {
         [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of EQ preset %i", i]]];
     }
-    
+
     return [presets autorelease];
 }
 
@@ -205,50 +205,50 @@
     int result;
     result = [[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd"
-                appPSN:[self iTunesPSN]];
+                                                           fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd"
+                                                                          appPSN:[self iTunesPSN]];
     return result;
 }
 
 - (BOOL)play
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
 - (BOOL)pause
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
 - (BOOL)goToNextSong
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
 - (BOOL)goToPreviousSong
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
 - (BOOL)fastForward
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
 - (BOOL)rewind
 {
     [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd"
-            appPSN:[self iTunesPSN]];
+                                                                                  appPSN:[self iTunesPSN]];
     return YES;
 }
 
@@ -279,14 +279,14 @@
 {
     NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     ProcessSerialNumber number;
-    int i;
-    
+    int i, count = [apps count];
+
     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"])
         {
             number.highLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberHigh"] intValue];
@@ -299,11 +299,11 @@
 - (void)applicationLaunched:(NSNotification *)note
 {
     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];
     }
 }
@@ -311,7 +311,7 @@
 - (void)applicationTerminated:(NSNotification *)note
 {
     NSDictionary *info = [note userInfo];
-    
+
     if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
         iTunesPSN.highLongOfPSN = kNoProcess;
         [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil];
@@ -325,17 +325,19 @@
     Size length;
     NSString *result;
     Ptr buffer;
-    
+
     script = [NSString stringWithFormat:@"tell application \"iTunes\"\n%@\nend tell", script];
-    
-    AECreateDesc(typeChar, [script cString], [script cStringLength], 
-&scriptDesc);
-    
+
+    //NSLog(@"I say \"%@\"",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);
@@ -347,6 +349,7 @@
     }
     free(buffer);
     buffer = nil;
+    //NSLog(@"You say \"%@\"",result);
     return result;
 }