Did some tinkering, nothing really useful done though. Removed a useless

[MenuTunes.git] / iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index cb976a6..68890d3 100755 (executable)
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -129,17 +129,28 @@
     const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
     NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:numPlaylists];
     
     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];
     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];
     }
         [playlists addObject:theObj];
     }

-    ITDebugLog(@"Finished getting playlists.");

     return [playlists autorelease];
     return [playlists autorelease];

+    /*unsigned long i,k;
+    const signed long numSources = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cSrc'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
+    NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:1];
+    
+    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];
+        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];
+            [playlists addObject:theObj];
+        }
+    }
+    ITDebugLog(@"Finished getting playlists.");
+    return [playlists autorelease];*/

 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index


@@ -176,9 +187,12 @@
             ITDebugLog(@"Getting current source done. Source: CD.");
             return ITMTRemoteCDSource;
             break;
             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 'kUnk':
         case 'kLib':

-        case 'kShd':

         default:
             ITDebugLog(@"Getting current source done. Source: Library.");
             return ITMTRemoteLibrarySource;
         default:
             ITDebugLog(@"Getting current source done. Source: Library.");
             return ITMTRemoteLibrarySource;


@@ -230,6 +244,7 @@
     int temp1;
     ITDebugLog(@"Getting current album track count.");
     temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
     int temp1;
     ITDebugLog(@"Getting current album track count.");
     temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];

+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }

     ITDebugLog(@"Getting current album track count done.");
     return temp1;
 }
     ITDebugLog(@"Getting current album track count done.");
     return temp1;
 }


@@ -239,6 +254,7 @@
     int temp1;
     ITDebugLog(@"Getting current song track.");
     temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrN" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
     int temp1;
     ITDebugLog(@"Getting current song track.");
     temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrN" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];

+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }

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


@@ -274,7 +290,11 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song artist.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
+        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    } else {
+        temp1 = @"";
+    }

     ITDebugLog(@"Getting current song artist done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }
     ITDebugLog(@"Getting current song artist done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }


@@ -283,7 +303,11 @@
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song album.");
 {
     NSString *temp1;
     ITDebugLog(@"Getting current song album.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
+        temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    } else {
+        temp1 = @"";
+    }

     ITDebugLog(@"Getting current song album done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }
     ITDebugLog(@"Getting current song album done.");
     return ( ([temp1 length]) ? temp1 : nil ) ;
 }


@@ -299,17 +323,22 @@
 
 - (NSString *)currentSongLength
 {
 
 - (NSString *)currentSongLength
 {

-    NSString *temp1;
+    int temp1;
+    NSString *temp2;

     ITDebugLog(@"Getting current song length.");
     ITDebugLog(@"Getting current song length.");

-    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    temp2 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (temp1 == 'cURT') ) { temp2 = @"Continuous"; }

     ITDebugLog(@"Getting current song length done.");
     ITDebugLog(@"Getting current song length done.");

-    return temp1;
+    return temp2;

 }
 
 - (NSString *)currentSongRemaining
 {
     long duration;
     long current;
 }
 
 - (NSString *)currentSongRemaining
 {
     long duration;
     long current;

+    long final;
+    NSString *finalString;

     
     ITDebugLog(@"Getting current song remaining time.");
     
     
     ITDebugLog(@"Getting current song remaining time.");
     


@@ -317,20 +346,35 @@
                         sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
     current = [[ITAppleEventCenter sharedCenter]
                         sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
                         sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
     current = [[ITAppleEventCenter sharedCenter]
                         sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];

+                        
+    final = duration - current;
+    finalString = [self formatTimeInSeconds:final];
+    
+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { finalString = nil; }
+    

     ITDebugLog(@"Getting current song remaining time done.");
     ITDebugLog(@"Getting current song remaining time done.");

-    return [[NSNumber numberWithLong:duration - current] stringValue];
+    
+    return finalString;

 }
 
 - (NSString *)currentSongElapsed
 {
 }
 
 - (NSString *)currentSongElapsed
 {

-    long current;
+    long final;
+    NSString *finalString;

     
     ITDebugLog(@"Getting current song elapsed time.");
     
     
     ITDebugLog(@"Getting current song elapsed time.");
     

-    current = [[ITAppleEventCenter sharedCenter]
+    final = [[ITAppleEventCenter sharedCenter]

                         sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
                         sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];

+                        
+    finalString = [self formatTimeInSeconds:final];

     ITDebugLog(@"Getting current song elapsed time done.");
     ITDebugLog(@"Getting current song elapsed time done.");

-    return [[NSNumber numberWithLong:current] stringValue];
+    return finalString;
+}
+
+- (NSImage *)currentSongAlbumArt
+{
+    return nil;

 }
 
 - (float)currentSongRating
 }
 
 - (float)currentSongRating


@@ -339,6 +383,7 @@
     ITDebugLog(@"Getting current song rating.");
     temp1 = ((float)[[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pRte" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] / 100.0);
     ITDebugLog(@"Getting current song rating.");
     temp1 = ((float)[[ITAppleEventCenter sharedCenter]
                 sendTwoTierAEWithRequestedKeyForNumber:@"pRte" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] / 100.0);

+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = -1.0; }

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


@@ -346,6 +391,7 @@
 - (BOOL)setCurrentSongRating:(float)rating
 {
     ITDebugLog(@"Setting current song rating to %f.", rating);
 - (BOOL)setCurrentSongRating:(float)rating
 {
     ITDebugLog(@"Setting current song rating to %f.", rating);

+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { return NO; }

     [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",(long)(rating*100),[self currentSongIndex]] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
     ITDebugLog(@"Setting current song rating to %f done.", rating);
     return YES;
     [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pRte'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",(long)(rating*100),[self currentSongIndex]] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
     ITDebugLog(@"Setting current song rating to %f done.", rating);
     return YES;


@@ -420,7 +466,6 @@
     } else {
         final = NO;
     }
     } else {
         final = NO;
     }

-    NSLog(@"shuffleEnabled: final = %i", final);

     ITDebugLog(@"Getting shuffle enabled status done.");
     return final;
 }
     ITDebugLog(@"Getting shuffle enabled status done.");
     return final;
 }


@@ -601,4 +646,28 @@
     return number;
 }
 
     return number;
 }
 

+- (NSString*)formatTimeInSeconds:(long)seconds {
+    long final = seconds;
+    NSString *finalString;
+    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 {
+            finalString = [NSString stringWithFormat:@"%i:%@",(final / 60),[self zeroSixty:(int)(final % 60)]];
+        }
+    } else {
+        finalString = [NSString stringWithFormat:@"0:%@",[self zeroSixty:(int)final]];
+    }
+    return finalString;
+}
+- (NSString*)zeroSixty:(int)seconds {
+    if ( (seconds < 10) && (seconds > 0) ) {
+        return [NSString stringWithFormat:@"0%i",seconds];
+    } else if ( (seconds == 0) ) {
+        return [NSString stringWithFormat:@"00"];
+    } else {
+        return [NSString stringWithFormat:@"%i",seconds];
+    }
+}
+

 @end
 @end