Number returning methods now work, for the most part.

[MenuTunes.git] / iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 8886102..27d346e 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -42,27 +42,41 @@
 
 - (NSArray *)sources
 {
+    //This is probably unneeded
     return nil;
 }
 
 - (int)currentSourceIndex
 {
+    //This is probably unneeded
     return nil;
 }
 
 - (NSArray *)playlistsForCurrentSource
 {
+    //This is probably unneeded
     return nil;
 }
 
-- (int)currentPlaylistIndex
+- (NSString *)sourceTypeOfCurrentPlaylist
 {
+    //Not working yet. It returns the 4 character code instead of a name.
     NSString *result;
-    result = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pidx"
+    result = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKey:@"pcls"
                 fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
                 appPSN:[self iTunesPSN]];
-    NSLog(@"result: %@", result);
-    return nil;
+    return result;
+}
+
+- (int)currentPlaylistIndex
+{
+    int result;
+    result = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
+                fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd"
+                appPSN:[self iTunesPSN]];
+    return result;
 }
 
 - (NSString *)songTitleAtIndex
@@ -72,12 +86,12 @@
 
 - (int)currentSongIndex
 {
-    NSString *result;
-    result = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pidx"
+    int result;
+    result = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
                 fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
                 appPSN:[self iTunesPSN]];
-    NSLog(@"result: %@", result);
-    return nil;
+    return result;
 }
 
 - (NSString *)currentSongTitle
@@ -117,17 +131,16 @@
 
 - (NSString *)currentSongRemaining
 {
-    NSString* duration = [[ITAppleEventCenter sharedCenter]
-                        sendTwoTierAEWithRequestedKey:@"pDur"
+    long duration = [[ITAppleEventCenter sharedCenter]
+                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur"
                         fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd"
                         appPSN:[self iTunesPSN]];
-    NSString* current = [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKey:@"pPos"
+    long current = [[ITAppleEventCenter sharedCenter]
+                        sendAEWithRequestedKeyForNumber:@"pPos"
                         eventClass:@"core" eventID:@"getd"
                         appPSN:[self iTunesPSN]];
-    NSLog(@"%@ %@", duration, current);
-    //return [[NSNumber numberWithInt:duration - current] stringValue];
-    return nil;
+    
+    return [[NSNumber numberWithLong:duration - current] stringValue];
 }
 
 - (NSArray *)eqPresets;
@@ -165,16 +178,19 @@
 
 - (BOOL)goToNextPlaylist
 {
+    //This is probably unneeded
     return NO;
 }
 
 - (BOOL)goToPreviousPlaylist
 {
+    //This is probably unneeded
     return NO;
 }
 
 - (BOOL)switchToSourceAtIndex:(int)index
 {
+    //This is probably unneeded
     return NO;
 }