X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/38eeefe80602c6a1bac5083baef95e32d01757b1..60a701dc9c0049a86bd739dbb8ae00c03cf90e48:/iTunesRemote.m diff --git a/iTunesRemote.m b/iTunesRemote.m index 3e25046..4b04840 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -65,12 +65,17 @@ - (BOOL)showPrimaryInterface { ITDebugLog(@"Showing player primary interface."); - // Still have to convert these to AEs: - // set minimized of browser window 1 to false - [[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 + //If not minimized + if ([[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] == 0) { + //set minimized of browser window 1 to true + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':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]; + } else { + //set minimized of browser window 1 to false + [[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. + //active iTunes [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:savedPSN]; ITDebugLog(@"Done showing player primary interface."); return YES; @@ -129,24 +134,72 @@ const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN]; NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:numPlaylists]; - ITDebugLog(@"Getting playlists."); - for (i = 1; i <= numPlaylists; i++) { const long j = i; NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%lu), from:'null'() } }",(unsigned long)j]; NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; - ITDebugLog(@"Adding playlist: %@", theObj); [playlists addObject:theObj]; } - ITDebugLog(@"Finished getting playlists."); return [playlists autorelease]; } +//Full source awareness +/*- (NSArray *)playlists +{ unsigned long i,k; + const signed long numSources = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cSrc'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN]; + NSMutableArray *allSources = [[NSMutableArray alloc] init]; + + ITDebugLog(@"Getting playlists."); + for (k = 1; k <= numSources ; k++) { + const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cPly'), '----':obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() }",k] eventClass:@"core" eventID:@"cnte" appPSN:savedPSN]; + unsigned long fourcc = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k] eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; + NSString *sourceName = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k] eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; + NSNumber *sourceClass; + NSMutableArray *aSource = [[NSMutableArray alloc] init]; + [aSource addObject:sourceName]; + + switch (fourcc) { + case 'kTun': + sourceClass = [NSNumber numberWithInt:ITMTRemoteRadioSource]; + break; + case 'kDev': + sourceClass = [NSNumber numberWithInt:ITMTRemoteGenericDeviceSource]; + break; + case 'kPod': + sourceClass = [NSNumber numberWithInt:ITMTRemoteiPodSource]; + break; + case 'kMCD': + case 'kACD': + sourceClass = [NSNumber numberWithInt:ITMTRemoteCDSource]; + break; + case 'kShd': + sourceClass = [NSNumber numberWithInt:ITMTRemoteSharedLibrarySource]; + break; + case 'kUnk': + case 'kLib': + default: + sourceClass = [NSNumber numberWithInt:ITMTRemoteLibrarySource]; + break; + } + + [aSource addObject:sourceClass]; + for (i = 1; i <= numPlaylists; i++) { + NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%u), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } } }",i,k]; + NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; + [aSource addObject:theObj]; + } + [allSources addObject:aSource]; + [aSource release]; + } + ITDebugLog(@"Finished getting playlists."); + return [NSArray arrayWithArray:[allSources autorelease]]; +}*/ + - (int)numberOfSongsInPlaylistAtIndex:(int)index { int temp1; ITDebugLog(@"Getting number of songs in playlist at index %i", index); - temp1 = [[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]; + temp1 = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:type('cTrk'), '----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"cnte" appPSN:savedPSN]; ITDebugLog(@"Getting number of songs in playlist at index %i done", index); return temp1; } @@ -176,9 +229,12 @@ ITDebugLog(@"Getting current source done. Source: CD."); return ITMTRemoteCDSource; break; + case 'kShd': + ITDebugLog(@"Getting current source done. Source: Shared Library."); + return ITMTRemoteSharedLibrarySource; + break; case 'kUnk': case 'kLib': - case 'kShd': default: ITDebugLog(@"Getting current source done. Source: Library."); return ITMTRemoteLibrarySource; @@ -186,6 +242,12 @@ } } +- (int)currentSourceIndex +{ + ITDebugLog(@"Getting current source."); + return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), 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]; +} + - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass { int realResult = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; @@ -360,7 +422,14 @@ - (NSImage *)currentSongAlbumArt { - return nil; + ITDebugLog(@"Getting current song album art."); + NSData *data = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForData:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPCT'), from:obj { form:'indx', want:type('cArt'), seld:long(1), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } } }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN]; + ITDebugLog(@"Getting current song album art done."); + if (data) { + return [[[NSImage alloc] initWithData:data] autorelease]; + } else { + return nil; + } } - (float)currentSongRating @@ -564,11 +633,20 @@ - (BOOL)switchToPlaylistAtIndex:(int)index { ITDebugLog(@"Switching to playlist at index %i", index); - [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }",index] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN]; + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }", index] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN]; ITDebugLog(@"Done switching to playlist at index %i", index); return YES; } +/*- (BOOL)switchToPlaylistAtIndex:(int)index ofSourceAtIndex:(int)index2 +{ + ITDebugLog(@"Switching to playlist at index %i of source %i", index, index2); + [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from: obj { form:'indx', want:type('cSrc'), seld:long(%lu), from:'null'() } }", index - 1, index2 + 1] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN]; + //{ form:'indx', want:type('cPly'), seld:long(%lu), from:obj { form:'indx', want:type('cSrc'), seld:long('%lu'), from:'null'() } } -- obj { form:'indx', want:type('cSrc'), seld:long(1), from:'null'() } + ITDebugLog(@"Done switching to playlist at index %i of source %i", index, index2); + return YES; +}*/ + - (BOOL)switchToSongAtIndex:(int)index { ITDebugLog(@"Switching to track at index %i", index); @@ -635,7 +713,7 @@ - (NSString*)formatTimeInSeconds:(long)seconds { long final = seconds; NSString *finalString; - if (final > 60) { + if (final >= 60) { if (final > 3600) { finalString = [NSString stringWithFormat:@"%i:%@:%@",(final / 3600),[self zeroSixty:(int)((final % 3600) / 60)],[self zeroSixty:(int)((final % 3600) % 60)]]; } else {