X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/e980fa37a154b26625b8e9472bfd5404bde0aa85..ee13ab078aee1bb34f14817175119872da6864ea:/iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index b89ccec..4d19980 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -72,12 +72,13 @@
 - (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:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    // Still have to convert these to AEs:
     //	set visible of browser window 1 to true
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:true($$), ----:obj { form:'prop', want:'prop', seld:'pvis', from:obj { form:'indx', want:'cBrW', seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
     //	set minimized of browser window 1 to false
-    //	set view of browser window 1 to (playlist (index of current playlist))
-    //end tell
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:fals($$), ----:obj { form:'prop', want:'prop', seld:'pMin', from:obj { form:'indx', want:'cBrW', seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+
     return NO;
 }
 
@@ -167,7 +168,7 @@
 
 - (NSString *)currentSongUniqueIdentifier
 {
-    return @"BBQ";
+    return [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pDID" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN]];
 }
 
 - (int)currentSongIndex
@@ -224,8 +225,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(@"Debug equalizerEnabled: %i", thingy);
+    return thingy;    
 }
 
 - (BOOL)setEqualizerEnabled:(BOOL)enabled