X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/cacee349eceeff2db2146d3b53f39412418a4dde..638a7667c112946db22afac6aae36cc9e5c57f13:/iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 9a942d8..4352b89 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -62,15 +62,15 @@
 
 - (BOOL)showPrimaryInterface
 {
-    // Make this into AppleEvents... shouldn't be too hard, I'm just too tired to do it right now.
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
     // Still have to convert these to AEs:
-    //	set visible of browser window 1 to true
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), ----:obj { form:'prop', want:'prop', seld:'pvis', from:obj { form:'indx', want:'cBrW', seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
     //	set minimized of browser window 1 to false
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(0), ----:obj { form:'prop', want:'prop', seld:'pMin', from:obj { form:'indx', want:'cBrW', seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    //	set visible of browser window 1 to true
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    // Make this into AppleEvents... shouldn't be too hard, I'm just too tired to do it right now.
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
 
-    return NO;
+    return YES;
 }
 
 - (ITMTRemotePlayerRunningState)playerRunningState
@@ -128,9 +128,30 @@
 {
     return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cTrk'), '----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:'null'() }",index] eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
 }
+
 - (ITMTRemotePlayerSource)currentSource
 {
-    return ITMTRemoteLibrarySource;
+    unsigned long fourcc = (unsigned long)[[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pKnd" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    switch (fourcc) {
+	case 'kUnk':
+	case 'kLib':
+	case 'kShd':
+	default:
+	    return ITMTRemoteLibrarySource;
+	    break;
+	case 'kTun':
+	    return ITMTRemoteRadioSource;
+	    break;
+	case 'kDev':
+	    return ITMTRemoteGenericDeviceSource;
+	case 'kPod':
+	    return ITMTRemoteiPodSource; //this is stupid
+	    break;
+	case 'kMCD':
+	case 'kACD':
+	    return ITMTRemoteCDSource;
+	    break;
+    }
 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass