X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/c666e2ee7f2a80b36aca7e02c4fdd9e6f0051576..6f276052ff907885a6674cd5fbec7aa2d8082cf8:/iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index fe6e1a2..c00d5fa 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -157,7 +157,8 @@
 
     ITDebugLog(@"Getting current source.");   
     
-    fourcc = (unsigned long)[[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pKnd" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    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];
+    
     switch (fourcc) {
         case 'kTun':
             ITDebugLog(@"Getting current source done. Source: Radio.");
@@ -320,6 +321,18 @@
     return [[NSNumber numberWithLong:duration - current] stringValue];
 }
 
+- (NSString *)currentSongElapsed
+{
+    long current;
+    
+    ITDebugLog(@"Getting current song elapsed time.");
+    
+    current = [[ITAppleEventCenter sharedCenter]
+                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song elapsed time done.");
+    return [[NSNumber numberWithLong:current] stringValue];
+}
+
 - (float)currentSongRating
 {
     float temp1;
@@ -399,10 +412,17 @@
 - (BOOL)shuffleEnabled
 {
     ITDebugLog(@"Getting shuffle enabled status.");
+    BOOL final;
     int result = [[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pShf" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    if (result != 0) {
+        final = YES;
+    } else {
+        final = NO;
+    }
+    NSLog(@"shuffleEnabled: final = %i", final);
     ITDebugLog(@"Getting shuffle enabled status done.");
-    return result;
+    return final;
 }
 
 - (BOOL)setShuffleEnabled:(BOOL)enabled
@@ -530,6 +550,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];
     [[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];
     ITDebugLog(@"Done switching to EQ preset at index %i", index);
     return YES;