Readding LibValidate as binary
[MenuTunes.git] / iTunesRemote.m
index a743bb0..f197b97 100755 (executable)
     return [[[iTunesRemote alloc] init] autorelease];
 }
 
-- (NSString *)title
+- (NSString *)remoteTitle
 {
-    return @"iTunes Plug-in";
+    return @"iTunes Remote";
 }
 
-- (NSString *)information;
+- (NSString *)remoteInformation
 {
-    return @"Default MenuTunes plugin to control iTunes. Written by iThink Software.";
+    return @"Default MenuTunes plugin to control iTunes, by iThink Software.";
 }
 
-- (NSImage *)icon
+- (NSImage *)remoteIcon
 {
     return nil;
 }
 
 - (BOOL)begin
 {
-    iTunesPSN = [self iTunesPSN];
-
-    //Register for application termination in NSWorkspace
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
-
+    ITDebugLog(@"iTunesRemote begun");
+    savedPSN = [self iTunesPSN];
     return YES;
 }
 
 - (BOOL)halt
 {
-    iTunesPSN.highLongOfPSN = kNoProcess;
+    ITDebugLog(@"iTunesRemote halted");
+    return YES;
+}
 
-    //Unregister for application termination in NSWorkspace
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+- (NSString *)playerFullName
+{
+    return @"iTunes";
+}
 
+- (NSString *)playerSimpleName
+{
+    return @"iTunes";
+}
+
+- (NSDictionary *)capabilities
+{
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+                [NSNumber numberWithBool: YES], @"Remote",
+                [NSNumber numberWithBool: YES], @"Basic Track Control",
+                [NSNumber numberWithBool: YES], @"Track Information",
+                [NSNumber numberWithBool: YES], @"Track Navigation",
+                [NSNumber numberWithBool: YES], @"Upcoming Songs",
+                [NSNumber numberWithBool: YES], @"Playlists",
+                [NSNumber numberWithBool: YES], @"Volume",
+                [NSNumber numberWithBool: YES], @"Shuffle",
+                [NSNumber numberWithBool: YES], @"Repeat Modes",
+                [NSNumber numberWithBool: YES], @"Equalizer",
+                [NSNumber numberWithBool: YES], @"Track Rating",
+                nil];
+}
+
+- (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
+    [[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];
+    ITDebugLog(@"Done showing player primary interface.");
     return YES;
 }
 
-- (BOOL)isAppRunning
+- (ITMTRemotePlayerRunningState)playerRunningState
 {
     NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
-    int i,count = [apps count];
-
+    int i;
+    int count = [apps count];
+    
     for (i = 0; i < count; i++) {
-        if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"]
-                isEqualToString:@"iTunes"]) {
-            return YES;
+        if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+            ITDebugLog(@"Player running state: 1");
+            return ITMTRemotePlayerRunning;
         }
     }
-    return NO;
+    ITDebugLog(@"Player running state: 0");
+    return ITMTRemotePlayerNotRunning;
 }
 
-- (PlayerState)playerState
+- (ITMTRemotePlayerPlayingState)playerPlayingState
 {
-    long result = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-
+    long result;
+    
+    ITDebugLog(@"Getting player playing state");
+    
+    result = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    
     switch (result)
-          {
-          default:
-          case 'kPSS':
-                 return stopped;
-          case 'kPSP':
-                 return paused;
-          case 'kPSp':
-                 return playing;
-          case 'kPSR':
-                 return rewinding;
-          case 'kPSF':
-                 return forwarding;
-          }
-
-    return stopped;
+    {
+        case 'kPSP':
+            ITDebugLog(@"Getting player playing state done. Player state: Playing");
+            return ITMTRemotePlayerPlaying;
+        case 'kPSp':
+            ITDebugLog(@"Getting player playing state done. Player state: Paused");
+            return ITMTRemotePlayerPaused;
+        case 'kPSR':
+            ITDebugLog(@"Getting player playing state done. Player state: Rewinding");
+            return ITMTRemotePlayerRewinding;
+        case 'kPSF':
+            ITDebugLog(@"Getting player playing state done. Player state: Forwarding");
+            return ITMTRemotePlayerForwarding;
+        case 'kPSS':
+        default:
+            ITDebugLog(@"Getting player playing state done. Player state: Stopped");
+            return ITMTRemotePlayerStopped;
+    }
+    ITDebugLog(@"Getting player playing state done. Player state: Stopped");
+    return ITMTRemotePlayerStopped;
 }
 
 - (NSArray *)playlists
 {
     long i = 0;
-    const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:[self iTunesPSN]];
+    const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
     NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:numPlaylists];
-    NSLog(@"entered playlist");
-
-          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:%lu, from:'null'() } }",(unsigned long)j];
-                 NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-                 NSLog(@"sent event cur %d max %d",i,numPlaylists);
-                 [playlists addObject:theObj];
-          }
-          NSLog(@"playlists end");
-          return [playlists autorelease];
+    
+    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];
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
-    return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:[NSString stringWithFormat:@"kocl:'cTrk', '----':obj { form:'indx', want:type('cPly'), seld:%i, from:'null'() }",index] eventClass:@"core" eventID:@"cnte" appPSN:[self iTunesPSN]];
+    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];
+    ITDebugLog(@"Getting number of songs in playlist at index %i done", index);
+    return temp1;
+}
+
+- (ITMTRemotePlayerSource)currentSource
+{
+    unsigned long fourcc;
+
+    ITDebugLog(@"Getting current source.");   
+    
+    fourcc = (unsigned long)[[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber :[NSString stringWithFormat:@"'----':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'() } } }"] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    
+    switch (fourcc) {
+        case 'kTun':
+            ITDebugLog(@"Getting current source done. Source: Radio.");
+            return ITMTRemoteRadioSource;
+            break;
+        case 'kDev':
+            ITDebugLog(@"Getting current source done. Source: Generic Device.");
+            return ITMTRemoteGenericDeviceSource;
+        case 'kPod':
+            ITDebugLog(@"Getting current source done. Source: iPod.");
+            return ITMTRemoteiPodSource; //this is stupid
+            break;
+        case 'kMCD':
+        case 'kACD':
+            ITDebugLog(@"Getting current source done. Source: CD.");
+            return ITMTRemoteCDSource;
+            break;
+        case 'kUnk':
+        case 'kLib':
+        case 'kShd':
+        default:
+            ITDebugLog(@"Getting current source done. Source: Library.");
+            return ITMTRemoteLibrarySource;
+            break;
+    }
 }
 
-- (NSString *)classOfPlaylistAtIndex:(int)index
+- (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
-    int realResult = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-
-    if (realResult == 'cRTP') return @"radio tuner playlist";
-    else return @"playlist";
+    int realResult = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    
+    ITDebugLog(@"Getting current playlist class");
+    switch (realResult)
+          {
+          case 'cLiP':
+              ITDebugLog(@"Getting current playlist class done. Class: Library.");
+              return ITMTRemotePlayerLibraryPlaylist;
+              break;
+          case 'cRTP':
+              ITDebugLog(@"Getting current playlist class done. Class: Radio.");
+              return ITMTRemotePlayerRadioPlaylist;
+              break;
+          default:
+              ITDebugLog(@"Getting current playlist class done. Class: Standard playlist.");
+              return ITMTRemotePlayerPlaylist;
+          }
 }
 
 - (int)currentPlaylistIndex
-{
-    int result;
-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-    return result;
+{  
+    int temp1;
+    ITDebugLog(@"Getting current playlist index.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current playlist index done.");
+    return temp1;
 }
 
 - (NSString *)songTitleAtIndex:(int)index
 {
-    return [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cTrk'), seld:%i, from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting song title at index %i.", index);
+    temp1 = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting song title at index %i done.", index);
+    return ( ([temp1 length]) ? temp1 : nil ) ;
+}
+
+- (int)currentAlbumTrackCount
+{
+    int temp1;
+    ITDebugLog(@"Getting current album track count.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current album track count done.");
+    return temp1;
+}
+
+- (int)currentSongTrack
+{
+    int temp1;
+    ITDebugLog(@"Getting current song track.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pTrN" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song track done.");
+    return temp1;
+}
+
+- (NSString *)playerStateUniqueIdentifier
+{
+    NSString *temp1;
+    ITDebugLog(@"Getting current unique identifier.");
+    temp1 = [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pDID" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN]];
+    ITDebugLog(@"Getting current unique identifier done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (int)currentSongIndex
 {
-    int result;
-    result = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-    return result;
+    int temp1;
+    ITDebugLog(@"Getting current song index.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song index done.");
+    return temp1;
 }
 
 - (NSString *)currentSongTitle
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song title.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song title done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongArtist
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song artist.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song artist done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongAlbum
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song album.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song album done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongGenre
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song genre.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song genre done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongLength
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song length.");
+    temp1 = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pTim" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current song length done.");
+    return temp1;
 }
 
 - (NSString *)currentSongRemaining
 {
-    long duration = [[ITAppleEventCenter sharedCenter]
-                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-    long current = [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
+    long duration;
+    long current;
+    long final;
+    NSString *finalString;
+    
+    ITDebugLog(@"Getting current song remaining time.");
+    
+    duration = [[ITAppleEventCenter sharedCenter]
+                        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];
+    
+    ITDebugLog(@"Getting current song remaining time done.");
+    
+    return finalString;
+}
+
+- (NSString *)currentSongElapsed
+{
+    long final;
+    NSString *finalString;
+    
+    ITDebugLog(@"Getting current song elapsed time.");
+    
+    final = [[ITAppleEventCenter sharedCenter]
+                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+                        
+    finalString = [self formatTimeInSeconds:final];
+    ITDebugLog(@"Getting current song elapsed time done.");
+    return finalString;
+}
+
+- (float)currentSongRating
+{
+    float temp1;
+    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 done.");
+    return temp1;
+}
+
+- (BOOL)setCurrentSongRating:(float)rating
+{
+    ITDebugLog(@"Setting current song rating to %f.", rating);
+    [[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;
+}
+
+- (BOOL)equalizerEnabled
+{
+    ITDebugLog(@"Getting equalizer enabled status.");
+    int thingy = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:type('prop'), want:type('prop'), seld:type('pEQ '), from:() }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Done getting equalizer enabled status.");
+    return thingy;
+}
 
-    return [[NSNumber numberWithLong:duration - current] stringValue];
+- (BOOL)setEqualizerEnabled:(BOOL)enabled
+{
+    ITDebugLog(@"Setting equalizer enabled to %i.", enabled);
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:'null'() }",enabled] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    ITDebugLog(@"Done setting equalizer enabled to %i.", enabled);
+    return YES;
 }
 
-- (NSArray *)eqPresets;
+- (NSArray *)eqPresets
 {
     int i;
-    long numPresets = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cEQP'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:[self iTunesPSN]];
+    long numPresets = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cEQP'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
     NSMutableArray *presets = [[NSMutableArray alloc] initWithCapacity:numPresets];
-
-
-          for (i = 0; i < numPresets; i++) {
-                 NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cEQP'), seld:%d, from:'null'() } }",i] eventClass:@"core" eventID:@"getd" appPSN:[self iTunesPSN]];
-                 [presets addObject:theObj];
-          }
-          return [presets autorelease];
+    ITDebugLog(@"Getting EQ presets");
+    for (i = 1; i <= numPresets; i++) {
+        NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() } }",i] eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+        if (theObj) {
+            ITDebugLog(@"Adding preset %@", theObj);
+            [presets addObject:theObj];
+        }
+    }
+    ITDebugLog(@"Done getting EQ presets");
+    return [presets autorelease];
 }
 
 - (int)currentEQPresetIndex
 {
     int result;
+    ITDebugLog(@"Getting current EQ preset index.");
     result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx"
-                                                                                                         fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd"
-                                                                                                                                   appPSN:[self iTunesPSN]];
+                sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting current EQ preset index done.");
     return result;
 }
 
+- (float)volume
+{
+    ITDebugLog(@"Getting volume.");
+    ITDebugLog(@"Getting volume done.");
+    return (float)[[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pVol" eventClass:@"core" eventID:@"getd" appPSN:savedPSN] / 100;
+}
+
+- (BOOL)setVolume:(float)volume
+{
+    ITDebugLog(@"Setting volume to %f.", volume);
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pVol'), from:'null'() }",(long)(volume*100)] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    ITDebugLog(@"Setting volume to %f done.", volume);
+    return YES;
+}
+
+- (BOOL)shuffleEnabled
+{
+    ITDebugLog(@"Getting shuffle enabled status.");
+    BOOL final;
+    int result = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pShf" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    if (result != 0) {
+        final = YES;
+    } else {
+        final = NO;
+    }
+    ITDebugLog(@"Getting shuffle enabled status done.");
+    return final;
+}
+
+- (BOOL)setShuffleEnabled:(BOOL)enabled
+{
+    ITDebugLog(@"Set shuffle enabled to %i", enabled);
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",(unsigned long)enabled] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    ITDebugLog(@"Set shuffle enabled to %i done", enabled);
+    return YES;
+}
+
+- (ITMTRemotePlayerRepeatMode)repeatMode
+{
+    FourCharCode m00f = 0;
+    int result = 0;
+    m00f = [[ITAppleEventCenter sharedCenter]
+                sendTwoTierAEWithRequestedKeyForNumber:@"pRpt" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+    ITDebugLog(@"Getting repeat mode.");
+    switch (m00f)
+    {
+        //case 'kRp0':
+        case 1800564815:
+            ITDebugLog(@"Repeat off");
+            result = ITMTRemotePlayerRepeatOff;
+            break;
+        case 'kRp1':
+            ITDebugLog(@"Repeat one");
+            result = ITMTRemotePlayerRepeatOne;
+            break;
+        case 'kRpA':
+            ITDebugLog(@"Repeat all");
+            result = ITMTRemotePlayerRepeatAll;
+            break;
+    }
+    ITDebugLog(@"Getting repeat mode done.");
+    return result;
+}
+
+- (BOOL)setRepeatMode:(ITMTRemotePlayerRepeatMode)repeatMode
+{
+    char *m00f;
+    ITDebugLog(@"Setting repeat mode to %i", repeatMode);
+    switch (repeatMode)
+    {
+        case ITMTRemotePlayerRepeatOne:
+            m00f = "kRp1";
+            break;
+        case ITMTRemotePlayerRepeatAll:
+            m00f = "kRpA";
+            break;
+        case ITMTRemotePlayerRepeatOff:
+        default:
+            m00f = "kRp0";
+            break;
+    }
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:'%s', '----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }",m00f] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    ITDebugLog(@"Setting repeat mode to %c done", m00f);
+    return YES;
+}
+
 - (BOOL)play
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Play");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play" appPSN:savedPSN];
+    ITDebugLog(@"Play done");
     return YES;
 }
 
 - (BOOL)pause
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Pause");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus" appPSN:savedPSN];
+    ITDebugLog(@"Pause done");
     return YES;
 }
 
 - (BOOL)goToNextSong
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Go to next track");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next" appPSN:savedPSN];
+    ITDebugLog(@"Go to next track done");
     return YES;
 }
 
 - (BOOL)goToPreviousSong
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Go to previous track");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev" appPSN:savedPSN];
+    ITDebugLog(@"Go to previous track done");
     return YES;
 }
 
-- (BOOL)fastForward
+- (BOOL)forward
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Fast forward action");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast" appPSN:savedPSN];
+    ITDebugLog(@"Fast forward action done");
     return YES;
 }
 
 - (BOOL)rewind
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd"
-                                                                                                                                                  appPSN:[self iTunesPSN]];
+    ITDebugLog(@"Rewind action");
+    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd" appPSN:savedPSN];
+    ITDebugLog(@"Rewind action done");
     return YES;
 }
 
-
 - (BOOL)switchToPlaylistAtIndex:(int)index
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'name', want:type('cPly'), seld:%i, from:'null'() }",index] eventClass:@"hook" eventID:@"Play" appPSN:[self iTunesPSN]];
-    return NO;
+    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];
+    ITDebugLog(@"Done switching to playlist at index %i", index);
+    return YES;
 }
 
 - (BOOL)switchToSongAtIndex:(int)index
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cTrk'), seld:%i, from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",index] eventClass:@"hook" eventID:@"Play" appPSN:[self iTunesPSN]];
-    return NO;
+    ITDebugLog(@"Switching to track at index %i", index);
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }",index] eventClass:@"hook" eventID:@"Play" appPSN:savedPSN];
+    ITDebugLog(@"Done switching to track at index %i", index);
+    return YES;
 }
 
 - (BOOL)switchToEQAtIndex:(int)index
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:obj { form:'name', want:type('cEQP'), seld:%i, from:'null'() }, '----':obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() }",index] eventClass:@"core" eventID:@"setd" appPSN:[self iTunesPSN]];
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:@"data:1, '----':obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:'null'() }" eventClass:@"core" eventID:@"setd" appPSN:[self iTunesPSN]];
-    return NO;
+    ITDebugLog(@"Switching to EQ preset at index %i", index);
+    // index should count from 0, but itunes counts from 1, so let's add 1.
+    [self setEqualizerEnabled:YES];
+    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() }, data:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() }",(index+1)] eventClass:@"core" eventID:@"setd" appPSN:savedPSN];
+    ITDebugLog(@"Done switching to EQ preset at index %i", index);
+    return YES;
 }
 
 - (ProcessSerialNumber)iTunesPSN
 {
-    NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
+    /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     ProcessSerialNumber number;
-    int i, count = [apps count];
-
-              number.highLongOfPSN = kNoProcess;
-
-              for (i = 0; i < count; i++)
-                     {
-                         NSDictionary *curApp = [apps objectAtIndex:i];
-                        
-                                if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"])
-                                    {
-                                               number.highLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberHigh"] intValue];
-                                               number.lowLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberLow"] intValue];
-                                           }
-                            }
-    return number;}
-
-- (void)applicationLaunched:(NSNotification *)note
-{
-    NSDictionary *info = [note userInfo];
-
-    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
-        iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
-        iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
-
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+    int i;
+    int count = [apps count];
+    
+    number.highLongOfPSN = kNoProcess;
+    
+    for (i = 0; i < count; i++)
+    {
+        NSDictionary *curApp = [apps objectAtIndex:i];
+        
+        if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"])
+        {
+            number.highLongOfPSN = [[curApp objectForKey:
+                @"NSApplicationProcessSerialNumberHigh"] intValue];
+            number.lowLongOfPSN = [[curApp objectForKey:
+                @"NSApplicationProcessSerialNumberLow"] intValue];
+        }
     }
-}
-
-- (void)applicationTerminated:(NSNotification *)note
-{
-    NSDictionary *info = [note userInfo];
-
-    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
-        iTunesPSN.highLongOfPSN = kNoProcess;
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    return number;*/
+    ProcessSerialNumber number;
+    number.highLongOfPSN = kNoProcess;
+    number.lowLongOfPSN = 0;
+    ITDebugLog(@"Getting iTunes' PSN.");
+    while ( (GetNextProcess(&number) == noErr) ) 
+    {
+        CFStringRef name;
+        if ( (CopyProcessName(&number, &name) == noErr) )
+        {
+            if ([(NSString *)name isEqualToString:@"iTunes"])
+            {
+                ITDebugLog(@"iTunes' highLongOfPSN: %lu.", number.highLongOfPSN);
+                ITDebugLog(@"iTunes' lowLongOfPSN: %lu.", number.lowLongOfPSN);
+                ITDebugLog(@"Done getting iTunes' PSN.");
+                return number;
+            }
+            [(NSString *)name release];
+        }
+    }
+    ITDebugLog(@"Failed getting iTunes' PSN.");
+    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];
     }
 }