Updating previous track to work like iTunes, that is, if you're well into

[MenuTunes.git] / iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index 7bbe551..a5e45be 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -73,13 +73,13 @@
                         ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue] != 0) &&
              [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) {
             //set minimized of browser window 1 to true
                         ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue] != 0) &&
              [[[[NSWorkspace sharedWorkspace] activeApplication] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"] ) {
             //set minimized of browser window 1 to true

-                       ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'setd', &savedPSN);
+                       ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         } else {
             //set minimized of browser window 1 to false
         } else {
             //set minimized of browser window 1 to false

-                       ITSendAEWithString(@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'setd', &savedPSN);
+                       ITSendAEWithString(@"data:long(0), '----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         }
         //set visible of browser window 1 to true
         }
         //set visible of browser window 1 to true

-               ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'setd', &savedPSN);
+               ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pvis'), from:obj { form:'indx', want:type('cBrW'), seld:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);

         //active iTunes
                ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }", 'core', 'setd', &savedPSN);
         ITDebugLog(@"Done showing player primary interface.");
         //active iTunes
                ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pisf'), from:'null'() }", 'core', 'setd', &savedPSN);
         ITDebugLog(@"Done showing player primary interface.");


@@ -168,6 +168,7 @@
     
     ITDebugLog(@"Getting playlists.");
     if (numSources == 0) {
     
     ITDebugLog(@"Getting playlists.");
     if (numSources == 0) {

+               [allSources release];

         ITDebugLog(@"No sources.");
         return nil;
     }
         ITDebugLog(@"No sources.");
         return nil;
     }


@@ -262,9 +263,19 @@
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {

+       /*
+               This method only returns the proper number if there's something playing.
+               This is because it gets the container of the current playlist so that it
+               gets the playlist index from the current source. Operating this way is fine,
+               since MT only ever calls this method when there is something playlist.
+               A working version of this that works in just the main source is in the
+               makePlaylistWithTerm:ofType: method.
+       */

     int temp1;
     int temp1;

+       NSAppleEventDescriptor *result;

     ITDebugLog(@"Getting number of songs in playlist at index %i", index);
     ITDebugLog(@"Getting number of songs in playlist at index %i", index);

-    temp1 = [ITSendAEWithString([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], 'core', 'getd', &savedPSN) int32Value];
+       result = ITSendAEWithString([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], 'core', 'cnte', &savedPSN);
+       temp1 = (result == nil) ? -1 : (int)[result int32Value];

     ITDebugLog(@"Getting number of songs in playlist at index %i done", index);
     return temp1;
 }
     ITDebugLog(@"Getting number of songs in playlist at index %i done", index);
     return temp1;
 }


@@ -275,7 +286,7 @@
 
     ITDebugLog(@"Getting current source.");   
     
 
     ITDebugLog(@"Getting current source.");   
     

-    fourcc = [ITSendAEWithString(@"'----':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'() } } }", 'core', 'getd', &savedPSN) int32Value];
+    fourcc = ([self isPlaying]) ? [ITSendAEWithString(@"'----':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'() } } }", 'core', 'getd', &savedPSN) int32Value] : 'kLib';

     
     switch (fourcc) {
         case 'kTun':
     
     switch (fourcc) {
         case 'kTun':


@@ -338,7 +349,7 @@
 {  
     int temp1;
     ITDebugLog(@"Getting current playlist index.");
 {  
     int temp1;
     ITDebugLog(@"Getting current playlist index.");

-    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    temp1 = ([self isPlaying] ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] : -1);

     ITDebugLog(@"Getting current playlist index done.");
     return temp1;
 }
     ITDebugLog(@"Getting current playlist index done.");
     return temp1;
 }


@@ -376,10 +387,17 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current unique identifier.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current unique identifier.");

-    SInt32 cls = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+       NSAppleEventDescriptor *descriptor = ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN);
+       if ((descriptor == nil) || ([descriptor int32Value] == 'prop')) {
+               return @"0-0";
+       }
+    SInt32 cls = [descriptor int32Value];

     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (cls == 'cURT') ) {
     if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (cls == 'cURT') ) {

+               NSString *bad = [NSString stringWithUTF8String:"浳湧"];

         temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
         temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];

-               NSLog(@"%@", temp1);
+        if ([temp1 isEqualToString:bad]) {
+            temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+        }

     } else {
         temp1 = [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pDID'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value]];
     }
     } else {
         temp1 = [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pDID'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value]];
     }


@@ -391,7 +409,7 @@
 {
     int temp1;
     ITDebugLog(@"Getting current song index.");
 {
     int temp1;
     ITDebugLog(@"Getting current song index.");

-    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+       temp1 = ([self isPlaying] ? [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] : -1);

     ITDebugLog(@"Getting current song index done.");
     return temp1;
 }
     ITDebugLog(@"Getting current song index done.");
     return temp1;
 }


@@ -400,17 +418,19 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song title.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song title.");

-    
+    SInt32 result = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+       

     //If we're listening to the radio.
     //If we're listening to the radio.

-    if ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] == 'cURT') {
+    if (result == 'cURT') {

         NSString *bad = [NSString stringWithUTF8String:"浳湧"];
         temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
         if ([temp1 isEqualToString:bad]) {
         NSString *bad = [NSString stringWithUTF8String:"浳湧"];
         temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
         if ([temp1 isEqualToString:bad]) {

-                       NSLog(@"arrrr");

             temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
         }
         temp1 = [temp1 stringByAppendingString:@" (Stream)"];
             temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
         }
         temp1 = [temp1 stringByAppendingString:@" (Stream)"];

-    } else {
+    } else if (result == 'prop') {
+               temp1 = nil;
+       } else {

         temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
     }
     ITDebugLog(@"Getting current song title done.");
         temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
     }
     ITDebugLog(@"Getting current song title done.");


@@ -502,7 +522,7 @@
     NSString *finalString;
     
     ITDebugLog(@"Getting current song elapsed time.");
     NSString *finalString;
     
     ITDebugLog(@"Getting current song elapsed time.");

-    final = (long)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPos'), from:'null'() }", 'core', 'getd', &savedPSN) int32Value];
+       final = (long)[ITSendAEWithKey('pPos', 'core', 'getd', &savedPSN) int32Value];

     finalString = [self formatTimeInSeconds:final];
     ITDebugLog(@"Getting current song elapsed time done.");
     return finalString;
     finalString = [self formatTimeInSeconds:final];
     ITDebugLog(@"Getting current song elapsed time done.");
     return finalString;


@@ -511,7 +531,7 @@
 - (NSImage *)currentSongAlbumArt
 {
     ITDebugLog(@"Getting current song album art.");
 - (NSImage *)currentSongAlbumArt
 {
     ITDebugLog(@"Getting current song album art.");

-    NSData *data = [ITSendAEWithString(@"'----':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'() } } }", 'core', 'getd', &savedPSN) data];
+    NSData *data = ([self isPlaying]) ? [ITSendAEWithString(@"'----':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'() } } }", 'core', 'getd', &savedPSN) data] : nil;

     ITDebugLog(@"Getting current song album art done.");    
     if (data) {
         return [[[NSImage alloc] initWithData:data] autorelease];
     ITDebugLog(@"Getting current song album art done.");    
     if (data) {
         return [[[NSImage alloc] initWithData:data] autorelease];


@@ -533,8 +553,7 @@
 {
     float temp1;
     ITDebugLog(@"Getting current song rating.");
 {
     float temp1;
     ITDebugLog(@"Getting current song rating.");

-    temp1 = ((float)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] / 100.0);
-    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = -1.0; }
+    temp1 = (![self isPlaying] || ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist)) ? -1.0 : ((float)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] / 100.0);

     ITDebugLog(@"Getting current song rating done.");
     return temp1;
 }
     ITDebugLog(@"Getting current song rating done.");
     return temp1;
 }


@@ -702,7 +721,7 @@
 - (BOOL)goToPreviousSong
 {
     ITDebugLog(@"Go to previous track");
 - (BOOL)goToPreviousSong
 {
     ITDebugLog(@"Go to previous track");

-    ITSendAE('hook', 'Prev', &savedPSN);
+    ITSendAE('hook', 'Back', &savedPSN);

     ITDebugLog(@"Go to previous track done");
     return YES;
 }
     ITDebugLog(@"Go to previous track done");
     return YES;
 }


@@ -760,7 +779,7 @@
 - (BOOL)makePlaylistWithTerm:(NSString *)term ofType:(int)type
 {
     int i;
 - (BOOL)makePlaylistWithTerm:(NSString *)term ofType:(int)type
 {
     int i;

-    
+       

     //Get fixed indexing status
     BOOL fixed = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", 'core', 'getd', &savedPSN) booleanValue];
     
     //Get fixed indexing status
     BOOL fixed = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", 'core', 'getd', &savedPSN) booleanValue];
     


@@ -773,7 +792,7 @@
     //If MenuTunes playlist exists
     if ([ITSendAEWithString(@"'----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'doex', &savedPSN) booleanValue]) {
         //Clear old MenuTunes playlist
     //If MenuTunes playlist exists
     if ([ITSendAEWithString(@"'----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'doex', &savedPSN) booleanValue]) {
         //Clear old MenuTunes playlist

-        int numSongs = [ITSendAEWithString(@"kocl:type('cTrk'), '----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:obj { form:'prop', want:type('prop'), seld:type('ctnr'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", 'core', 'cnte', &savedPSN) int32Value];
+               int numSongs = [ITSendAEWithString(@"kocl:type('cTrk'), '----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'core', 'cnte', &savedPSN) int32Value];

         for (i = 1; i <= numSongs; i++) {
             ITSendAEWithString(@"'----':obj { form:'indx', want:type('cTrk'), seld:long(1), from:obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() } }", 'core', 'delo', &savedPSN);
         }
         for (i = 1; i <= numSongs; i++) {
             ITSendAEWithString(@"'----':obj { form:'indx', want:type('cTrk'), seld:long(1), from:obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() } }", 'core', 'delo', &savedPSN);
         }


@@ -795,6 +814,11 @@
     return YES;
 }
 
     return YES;
 }
 

+- (BOOL)isPlaying
+{
+       return ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] != 'prop');
+}
+

 - (ProcessSerialNumber)iTunesPSN
 {
     /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
 - (ProcessSerialNumber)iTunesPSN
 {
     /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];