X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/7b213e9391eadd0ed997971ea73b7b92b75408fb..f8b15427731ec2d8b6374baa51f5d133a209121e:/iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 5cda1b0..412b5e5 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -72,12 +72,11 @@
 - (BOOL)showPrimaryInterface
 {
     // Make this into AppleEvents... shouldn't be too hard, I'm just too tired to do it right now.
-    //tell application "iTunes"
-    //	set frontmost to true
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }",YES] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    // Still have to convert these to AEs:
     //	set visible of browser window 1 to true
     //	set minimized of browser window 1 to false
     //	set view of browser window 1 to (playlist (index of current playlist))
-    //end tell
     return NO;
 }
 
@@ -165,6 +164,11 @@
     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];
 }
 
+- (NSString *)currentSongUniqueIdentifier
+{
+    return [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pDID" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN]];
+}
+
 - (int)currentSongIndex
 {
     return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
@@ -219,8 +223,9 @@
 
 - (BOOL)equalizerEnabled
 {
-    return [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKeyForNumber:@"pEQ " eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    int thingy = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:type('prop'), want:type('prop'), seld:type('pEQ '), from:() }" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    NSLog(@"%i", thingy);
+    return thingy;    
 }
 
 - (BOOL)setEqualizerEnabled:(BOOL)enabled