X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/5973b75b6b4f55277003775f4793f190b6f9a72d..ba95bdd1193aefaac80e1f1f6d3956733ce0f3bd:/iTunesRemote.m

diff --git a/iTunesRemote.m b/iTunesRemote.m
index e5bec7b..8386b3c 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -1,4 +1,5 @@
 #import "iTunesRemote.h"
+#import "PlaylistNode.h"
 
 @implementation iTunesRemote
 
@@ -24,21 +25,30 @@
 
 - (BOOL)begin
 {
-    iTunesPSN = [self iTunesPSN];
-    
-    [[[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];
+	[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(notificationHandler:) name:@"com.apple.iTunes.playerInfo" object:@"com.apple.iTunes.player"];
+	
+	NSString *iTunesPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"CustomPlayerPath"];
+	NSDictionary *iTunesInfoPlist;
+	float iTunesVersion;
+
+	//Check if iTunes 5.0 or later is installed	
+	if (!iTunesPath) {
+		iTunesPath = [[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes.app"];
+	}
+	iTunesInfoPlist = [[NSBundle bundleWithPath:iTunesPath] infoDictionary];
+	iTunesVersion = [[iTunesInfoPlist objectForKey:@"CFBundleVersion"] floatValue];
+	ITDebugLog(@"iTunes version found: %f.", iTunesVersion);
+	_iTunesVersion = iTunesVersion;
+	
     return YES;
 }
 
 - (BOOL)halt
 {
-    iTunesPSN.highLongOfPSN = kNoProcess;
-
-    //Unregister for application termination in NSWorkspace
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-
+    ITDebugLog(@"iTunesRemote halted");
+	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
     return YES;
 }
 
@@ -71,15 +81,39 @@
 
 - (BOOL)showPrimaryInterface
 {
-    // Make this into AppleEvents... shouldn't be too hard, I'm just too tired to do it right now.
-    //tell application "iTunes"
-    //	set frontmost to true
-    //	set visible of browser window 1 to true
-    //	set minimized of browser window 1 to false
-    //	set view of browser window 1 to (playlist (index of current playlist))
-    //end tell
-    //Someone do this plz kthx
-    return NO;
+    ITDebugLog(@"Showing player primary interface.");
+    
+    if ([self playerRunningState] == ITMTRemotePlayerRunning) {
+        ITDebugLog(@"Showing player interface.");
+        //If not minimized and visible
+        if ( ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pMin'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue] == 0) &&
+			 ([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:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);
+        } 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:long(1), from:'null'() } }", 'core', 'setd', &savedPSN);
+        }
+        //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: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.");
+        return YES;
+    } else {
+        NSString *path;
+        ITDebugLog(@"Launching player.");
+        if ( (path = [[NSUserDefaults standardUserDefaults] stringForKey:@"CustomPlayerPath"]) ) {
+        } else {
+            path = [self playerFullName];
+        }
+        if (![[NSWorkspace sharedWorkspace] launchApplication:path]) {
+            ITDebugLog(@"Error Launching Player");
+            return NO;
+        }
+        return YES;
+    }
 }
 
 - (ITMTRemotePlayerRunningState)playerRunningState
@@ -90,298 +124,923 @@
     
     for (i = 0; i < count; i++) {
         if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+            ITDebugLog(@"Player running state: 1");
             return ITMTRemotePlayerRunning;
         }
     }
+    ITDebugLog(@"Player running state: 0");
     return ITMTRemotePlayerNotRunning;
 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
-    long result = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    SInt32 result;
     
+    ITDebugLog(@"Getting player playing state");
+    result = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlS'), from:'null'() }", 'core', 'getd', &savedPSN) typeCodeValue];
     switch (result)
     {
-        default:
-        case 'kPSS':
-            return ITMTRemotePlayerStopped;
         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
+/*- (NSArray *)playlists
 {
     long i = 0;
-    const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:iTunesPSN];
+    const signed long numPlaylists = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cPly'), '----':()" eventClass:@"core" eventID:@"cnte" appPSN:savedPSN];
     NSMutableArray *playlists = [[NSMutableArray alloc] initWithCapacity:numPlaylists];
     
     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:iTunesPSN];
+        NSString *theObj = [[ITAppleEventCenter sharedCenter] sendAEWithSendString:sendStr eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
         [playlists addObject:theObj];
     }
     return [playlists autorelease];
+}*/
+
+//Full source awareness
+/*- (NSArray *)playlists
+{
+    unsigned long i, k;
+    SInt32 numSources = [ITSendAEWithString(@"kocl:type('cSrc'), '----':()", 'core', 'cnte', &savedPSN) int32Value];
+    NSMutableArray *allSources = [[NSMutableArray alloc] init];
+    
+    ITDebugLog(@"Getting playlists.");
+    if (numSources == 0) {
+		[allSources release];
+        ITDebugLog(@"No sources.");
+        return nil;
+    }
+    
+    for (k = 1; k <= numSources ; k++) {
+        SInt32 numPlaylists = [ITSendAEWithString([NSString stringWithFormat:@"kocl:type('cPly'), '----':obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() }",k], 'core', 'cnte', &savedPSN) int32Value];
+        SInt32 fourcc = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) int32Value];
+        NSString *sourceName = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) stringValue];
+        SInt32 index = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'indx', want:type('cSrc'), seld:long(%u), from:() } }",k], 'core', 'getd', &savedPSN) int32Value];
+        unsigned long class;
+        if (sourceName) {
+            NSMutableArray *aSource = [[NSMutableArray alloc] init];
+            [aSource addObject:sourceName];
+            switch (fourcc) {
+                case 'kTun':
+                    class = ITMTRemoteRadioSource;
+                    break;
+                case 'kDev':
+                    class = ITMTRemoteGenericDeviceSource;
+                    break;
+                case 'kPod':
+                    class = ITMTRemoteiPodSource;
+                    break;
+                case 'kMCD':
+                case 'kACD':
+                    class = ITMTRemoteCDSource;
+                    break;
+                case 'kShd':
+                    class = ITMTRemoteSharedLibrarySource;
+                    break;
+                case 'kUnk':
+                case 'kLib':
+                default:
+                    class = ITMTRemoteLibrarySource;
+                    break;
+            }
+            ITDebugLog(@"Adding source %@ of type %i at index %i", sourceName, class, index);
+            [aSource addObject:[NSNumber numberWithInt:class]];
+            [aSource addObject:[NSNumber numberWithInt:index]];
+            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 = [ITSendAEWithString(sendStr, 'core', 'getd', &savedPSN) stringValue];
+                ITDebugLog(@" - Adding playlist %@", theObj);
+                if (theObj) {
+                    [aSource addObject:theObj];
+                }
+            }
+            [allSources addObject:[aSource autorelease]];
+        } else {
+            ITDebugLog(@"Source at index %i disappeared.", k);
+        }
+    }
+	NSLog(@"playlists: %@", allSources);
+    ITDebugLog(@"Finished getting playlists.");
+    return [allSources autorelease];
+}*/
+
+- (NSArray *)playlists
+{
+	SInt32 numSources = [ITSendAEWithString(@"kocl:type('cSrc'), '----':()", 'core', 'cnte', &savedPSN) int32Value];
+	NSMutableArray *sources = [[NSMutableArray alloc] init];
+	int i;
+	
+	ITDebugLog(@"Getting playlists.");
+    if (numSources == 0) {
+		[sources release];
+        ITDebugLog(@"No sources.");
+        return nil;
+    }
+	
+	//Loop through each source
+	for (i = 1; i <= numSources; i++) {
+        FourCharCode fourcc = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pKnd'), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } }", i], 'core', 'getd', &savedPSN) typeCodeValue]; //Type of the current source
+        NSString *sourceName = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } }", i], 'core', 'getd', &savedPSN) stringValue]; //Name of the current source
+        SInt32 index = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } }", i], 'core', 'getd', &savedPSN) int32Value]; //Index of the current source
+        ITMTRemotePlayerSource class; //The class of the current source
+		
+		//Make a new PlaylistNode for this source
+		PlaylistNode *sourceNode = [PlaylistNode playlistNodeWithName:sourceName type:ITMTSourceNode index:index];
+		
+		switch (fourcc) {
+			case 'kTun':
+				class = ITMTRemoteRadioSource;
+				break;
+			case 'kDev':
+				class = ITMTRemoteGenericDeviceSource;
+				break;
+			case 'kPod':
+				class = ITMTRemoteiPodSource;
+				break;
+			case 'kMCD':
+			case 'kACD':
+				class = ITMTRemoteCDSource;
+				break;
+			case 'kShd':
+				class = ITMTRemoteSharedLibrarySource;
+				break;
+			case 'kUnk':
+			case 'kLib':
+			default:
+				class = ITMTRemoteLibrarySource;
+				break;
+		}
+		[sourceNode setSourceType:class];
+		ITDebugLog(@"New source %@ of type %i at index %i", sourceName, class, index);
+		
+		int j;
+		SInt32 numPlaylists = [ITSendAEWithString([NSString stringWithFormat:@"kocl:type('cPly'), '----':obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() }", i], 'core', 'cnte', &savedPSN) int32Value]; //Number of playlists in the current source
+		
+		//Pass 1, add all the playlists into the main array
+		for (j = 1; j <= numPlaylists; j++) {
+			NSString *sendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cPly'), seld:long(%i), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } } }", j, (_iTunesVersion >= 5) ? i : index];
+			NSString *parentSendStr = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'prop', want:type('prop'), seld:type('pPlP'), from:obj { form:'indx', want:type('cPly'), seld:long(%i), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } } } }", j, i];
+			NSString *theObj = [ITSendAEWithString(sendStr, 'core', 'getd', &savedPSN) stringValue], *parent = [ITSendAEWithString(parentSendStr, 'core', 'getd', &savedPSN) stringValue];
+			ITDebugLog(@" - Adding playlist %@", theObj);
+			if (theObj) {
+				FourCharCode code = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pSpK'), from:obj { form:'indx', want:type('cPly'), seld:long(%i), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } } }", j, i], 'core', 'getd', &savedPSN) typeCodeValue];
+				ITMTNodeType type;
+				switch (code) {
+					case 'kSpN':
+						type = ITMTPlaylistNode;
+						break;
+					case 'kSpF':
+						type = ITMTFolderNode;
+						break;
+					case 'kSpS':
+						type = ITMTPartyShuffleNode;
+						break;
+					case 'kSpP':
+						type = ITMTPodcastsNode;
+						break;
+					case 'kSpM':
+						type = ITMTPurchasedMusicNode;
+						break;
+					case 'kSpV':
+						type = ITMTVideosNode;
+						break;
+				}
+				PlaylistNode *node = [PlaylistNode playlistNodeWithName:theObj type:type index:j];
+				[[sourceNode children] addObject:node];
+				if (parent) {
+					int parentIndex = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pPlP'), from:obj { form:'indx', want:type('cPly'), seld:long(%i), from:obj { form:'indx', want:type('cSrc'), seld:long(%i), from:() } } } }", j, i], 'core', 'getd', &savedPSN) int32Value];
+					[node setParent:[PlaylistNode playlistNodeWithName:parent type:ITMTFolderNode index:parentIndex]];
+				} else {
+					[node setParent:sourceNode];
+				}
+			}
+		}
+		
+		//Pass 2, nest each item under its proper parent. Once everything has been nested, delete the original from the main array.
+		NSEnumerator *enumerator = [[sourceNode children] objectEnumerator];
+		PlaylistNode *nextNode;
+		NSMutableArray *nested = [[NSMutableArray alloc] init];
+		
+		while ( (nextNode = [enumerator nextObject]) ) {
+			PlaylistNode *pNode = [nextNode parent];
+			if ([pNode type] == ITMTFolderNode) {
+				PlaylistNode *newParent = nil;
+				int k;
+				for (k = 0; !newParent; k++) {
+					PlaylistNode *test = [[sourceNode children] objectAtIndex:k];
+					if ([test index] == [pNode index]) {
+						newParent = test;
+					}
+				}
+				[[[nextNode parent] children] removeObject:nextNode];
+				[nextNode setParent:newParent];
+				[[newParent children] addObject:nextNode];
+				[newParent setType:ITMTFolderNode];
+				[nested addObject:nextNode];
+			}
+		}
+		
+		NSEnumerator *nestEnumerator = [nested objectEnumerator];
+		while ( (nextNode = [nestEnumerator nextObject]) ) {
+			[[sourceNode children] removeObject:nextNode];
+			[nested removeObject:nextNode];
+		}
+		[nested release];
+		
+		//Move all the folders to the beginning of the list
+		//Move the podcasts playlist to the top
+		BOOL movedPodcasts = NO;
+		enumerator = [[sourceNode children] reverseObjectEnumerator];
+		while ( (nextNode = [enumerator nextObject]) ) {
+			if ([nextNode type] == ITMTPodcastsNode) {
+				[[sourceNode children] removeObject:nextNode];
+				[[sourceNode children] insertObject:nextNode atIndex:1];
+				movedPodcasts = YES;
+			} else if ([nextNode type] == ITMTFolderNode) {
+				[[sourceNode children] removeObject:nextNode];
+				[[sourceNode children] insertObject:nextNode atIndex:1 + movedPodcasts];
+			}
+		}
+		
+		[sources addObject:sourceNode];
+	}
+	
+	return [sources autorelease];
+}
+
+- (NSArray *)artists
+{
+    NSAppleEventDescriptor *rawr = ITSendAEWithStringAndTimeout(@"'----':obj { form:'prop', want:type('prop'), seld:type('pArt'), from:obj { form:'indx', want:type('cTrk'), seld:abso($616C6C20$), from:obj { form:'indx', want:type('cPly'), seld:long(1), from:obj { form:'indx', want:type('cSrc'), seld:long(1), from:() } } } }", 'core', 'getd', &savedPSN, 600);
+    int i;
+    NSMutableArray *array = [[NSMutableArray alloc] init];
+    NSArray *returnArray;
+    for (i = 1; i <= [rawr numberOfItems]; i++) {
+        NSString *artist = [[rawr descriptorAtIndex:i] stringValue];
+        if (artist && [artist length] && ![array containsObject:artist]) {
+            [array addObject:artist];
+        }
+    }
+    [array sortUsingSelector:@selector(caseInsensitiveCompare:)];
+    returnArray = [NSArray arrayWithArray:array];
+    [array release];
+    return returnArray;
+}
+
+- (NSArray *)albums
+{
+    NSAppleEventDescriptor *rawr = ITSendAEWithStringAndTimeout(@"'----':obj { form:'prop', want:type('prop'), seld:type('pAlb'), from:obj { form:'indx', want:type('cTrk'), seld:abso($616C6C20$), from:obj { form:'indx', want:type('cPly'), seld:long(1), from:obj { form:'indx', want:type('cSrc'), seld:long(1), from:() } } } }", 'core', 'getd', &savedPSN, 600);
+    int i;
+    NSMutableArray *array = [[NSMutableArray alloc] init];
+    NSArray *returnArray;
+    for (i = 1; i <= [rawr numberOfItems]; i++) {
+        NSString *album = [[rawr descriptorAtIndex:i] stringValue];
+        if (album && [album length] && ![array containsObject:album]) {
+            [array addObject:album];
+        }
+    }
+    [array sortUsingSelector:@selector(caseInsensitiveCompare:)];
+    returnArray = [NSArray arrayWithArray:array];
+    [array release];
+    return returnArray;
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
-    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:iTunesPSN];
+	/*
+		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;
+	NSAppleEventDescriptor *result;
+    ITDebugLog(@"Getting number of songs in playlist at index %i", index);
+	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;
 }
 
-- (ITMTRemotePlayerPlaylistClass)classOfPlaylistAtIndex:(int)index
+- (ITMTRemotePlayerSource)currentSource
 {
-    int realResult = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pcls" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    SInt32 fourcc;
+
+    ITDebugLog(@"Getting current source.");   
+    
+    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) typeCodeValue] : 'kLib';
     
+    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 'kShd':
+            ITDebugLog(@"Getting current source done. Source: Shared Library.");
+            return ITMTRemoteSharedLibrarySource;
+            break;
+        case 'kUnk':
+        case 'kLib':
+        default:
+            ITDebugLog(@"Getting current source done. Source: Library.");
+            return ITMTRemoteLibrarySource;
+            break;
+    }
+}
 
+- (int)currentSourceIndex
+{
+    ITDebugLog(@"Getting current source.");
+    return [ITSendAEWithString(@"'----':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'() } } }", 'core', 'getd', &savedPSN) int32Value];
+}
+
+- (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
+{
+    FourCharCode realResult;
+    ITDebugLog(@"Getting current playlist class");
+    realResult = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) typeCodeValue];
     switch (realResult)
 	   {
 	   case 'cLiP':
-		  return ITMTRemotePlayerLibraryPlaylist;
-		  break;
+	       ITDebugLog(@"Getting current playlist class done. Class: Library.");
+	       return ITMTRemotePlayerLibraryPlaylist;
+	       break;
 	   case 'cRTP':
-		  return ITMTRemotePlayerRadioPlaylist;
-		  break;
+	       ITDebugLog(@"Getting current playlist class done. Class: Radio.");
+	       return ITMTRemotePlayerRadioPlaylist;
+	       break;
 	   default:
-		  return ITMTRemotePlayerPlaylist;
+	       ITDebugLog(@"Getting current playlist class done. Class: Standard playlist.");
+	       return ITMTRemotePlayerPlaylist;
 	   }
 }
 
 - (int)currentPlaylistIndex
-{
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+{  
+    int temp1;
+    ITDebugLog(@"Getting current playlist index.");
+    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;
 }
 
 - (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:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }",index] eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    NSString *temp1;
+    ITDebugLog(@"Getting song title at index %i.", index);
+    temp1 = [ITSendAEWithString([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], 'core', 'getd', &savedPSN) stringValue];
+    ITDebugLog(@"Getting song title at index %i done.", index);
+    return ( ([temp1 length]) ? temp1 : nil ) ;
+}
+
+- (BOOL)songEnabledAtIndex:(int)index
+{
+    BOOL temp1;
+    ITDebugLog(@"Getting song enabled at index %i.", index);
+    temp1 = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('enbl'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", index], 'core', 'getd', &savedPSN) booleanValue];
+    ITDebugLog(@"Getting song enabled at index %i done.", index);
+    return temp1;
+}
+
+- (int)currentAlbumTrackCount
+{
+    int temp1;
+    ITDebugLog(@"Getting current album track count.");
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTrC'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
+    ITDebugLog(@"Getting current album track count done.");
+    return temp1;
 }
 
-- (NSString *)currentSongUniqueIdentifier
+- (int)currentSongTrack
 {
-    return [NSString stringWithFormat:@"%i-%i", [self currentPlaylistIndex], [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pDID" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN]];
+    int temp1;
+    ITDebugLog(@"Getting current song track.");
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTrN'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { temp1 = 0; }
+    ITDebugLog(@"Getting current song track done.");
+    return temp1;
+}
+
+- (NSString *)playerStateUniqueIdentifier
+{
+    NSString *temp1;
+    ITDebugLog(@"Getting current unique identifier.");
+	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 typeCodeValue] == 'prop') {
+		return @"0-0";
+	} else if (descriptor == nil) {
+		return nil;
+	}
+    FourCharCode cls = [descriptor typeCodeValue];
+    if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (cls == 'cURT') ) {
+		NSString *bad = [NSString stringWithUTF8String:"浳湧"];
+        temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
+        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]];
+    }
+    ITDebugLog(@"Getting current unique identifier done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (int)currentSongIndex
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    int temp1;
+    ITDebugLog(@"Getting current song index.");
+	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;
 }
 
 - (NSString *)currentSongTitle
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song title.");
+    FourCharCode 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) typeCodeValue];
+	
+    //If we're listening to the radio.
+    if (result == 'cURT') {
+        NSString *bad = [NSString stringWithUTF8String:"浳湧"];
+        temp1 = [ITSendAEWithKey('pStT', 'core', 'getd', &savedPSN) stringValue];
+        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];
+        }
+        temp1 = [temp1 stringByAppendingString:@" (Stream)"];
+    } 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.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
 }
 
 - (NSString *)currentSongArtist
 {
-    return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song artist.");
+    if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pArt'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+    } else {
+        temp1 = @"";
+    }
+    ITDebugLog(@"Getting current song artist done.");
+    return ( ([temp1 length]) ? temp1 : nil ) ;
+}
+
+- (NSString *)currentSongComposer
+{
+    NSString *temp1;
+    ITDebugLog(@"Getting current song artist.");
+    if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pCmp'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+    } else {
+        temp1 = @"";
+    }
+    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:iTunesPSN];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song album.");
+    if ( [self currentPlaylistClass] != ITMTRemotePlayerRadioPlaylist ) {
+        temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pAlb'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+    } else {
+        temp1 = @"";
+    }
+    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:iTunesPSN];
+    NSString *temp1;
+    ITDebugLog(@"Getting current song genre.");
+    temp1 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pGen'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+    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:iTunesPSN];
+    SInt32 temp1;
+    NSString *temp2;
+    ITDebugLog(@"Getting current song length.");
+    temp1 = [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];
+    temp2 = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pTim'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) stringValue];
+    if ( ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) || (temp1 == 'cURT') ) { temp2 = @"Continuous"; }
+    ITDebugLog(@"Getting current song length done.");
+    return temp2;
 }
 
 - (NSString *)currentSongRemaining
 {
-    long duration = [[ITAppleEventCenter sharedCenter]
-                        sendTwoTierAEWithRequestedKeyForNumber:@"pDur" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
-    long current = [[ITAppleEventCenter sharedCenter]
-                        sendAEWithRequestedKeyForNumber:@"pPos" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    SInt32 duration, current, final;
+    NSString *finalString;
+    
+    ITDebugLog(@"Getting current song remaining time.");
+    
+    duration = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pDur'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    current = [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPos'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    final = duration - current;
+    finalString = [self formatTimeInSeconds:final];
+    
+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { finalString = nil; }
+    
+    ITDebugLog(@"Getting current song remaining time done.");
+    
+    return finalString;
+}
 
-    return [[NSNumber numberWithLong:duration - current] stringValue];
+- (NSString *)currentSongElapsed
+{
+    long final;
+    NSString *finalString;
+    
+    ITDebugLog(@"Getting current song elapsed time.");
+	final = (long)[ITSendAEWithKey('pPos', 'core', 'getd', &savedPSN) int32Value];
+    finalString = [self formatTimeInSeconds:final];
+    ITDebugLog(@"Getting current song elapsed time done.");
+    return finalString;
+}
+
+- (NSImage *)currentSongAlbumArt
+{
+    ITDebugLog(@"Getting current song album art.");
+    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];
+    } else {
+        return nil;
+    }
+}
+
+- (int)currentSongPlayCount
+{
+    int count;
+    ITDebugLog(@"Getting current song play count.");
+    count = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pPlC'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    ITDebugLog(@"Getting current song play count done.");
+    return count;
 }
 
 - (float)currentSongRating
 {
-    return [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pRte" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN] / 100;
+    float temp1;
+    ITDebugLog(@"Getting current song rating.");
+    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;
 }
 
 - (BOOL)setCurrentSongRating:(float)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:iTunesPSN];
+    ITDebugLog(@"Setting current song rating to %f.", rating);
+    if ( [self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist ) { return NO; }
+	ITSendAEWithString([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]], 'core', 'setd', &savedPSN);
+    ITDebugLog(@"Setting current song rating to %f done.", rating);
+    return YES;
+}
+
+- (BOOL)currentSongShufflable
+{
+	BOOL temp1;
+	ITDebugLog(@"Getting current song shufflable status.");
+    temp1 = (![self isPlaying] || ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist)) ? NO : [ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pSfa'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) booleanValue];
+    ITDebugLog(@"Getting current song shufflable status done.");
+    return temp1;
+}
+
+- (BOOL)setCurrentSongShufflable:(BOOL)shufflable
+{
+	ITDebugLog(@"Setting current song shufflable status to %i.", shufflable);
+    if ([self currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) {
+		ITDebugLog(@"Not a valid track to set status to, returning.");
+		return NO;
+	}
+	ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pSfa'), from:obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } } }", shufflable, [self currentSongIndex]], 'core', 'setd', &savedPSN);
+    ITDebugLog(@"Setting current song shufflable status to %i done.", shufflable);
     return YES;
 }
 
 - (BOOL)equalizerEnabled
 {
-    return [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:type('prop'), want:type('prop'), seld:type('pEQ '), from:() }" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
-    
+    ITDebugLog(@"Getting equalizer enabled status.");
+    int thingy = (int)[ITSendAEWithKey('pEQ ', 'core', 'getd', &savedPSN) int32Value];
+    ITDebugLog(@"Done getting equalizer enabled status.");
+    return (thingy != 0) ? YES : NO;
 }
 
 - (BOOL)setEqualizerEnabled:(BOOL)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:iTunesPSN];
+    ITDebugLog(@"Setting equalizer enabled to %i.", enabled);
+	ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pEQ '), from:'null'() }", enabled], 'core', 'setd', &savedPSN);
+    ITDebugLog(@"Done setting equalizer enabled to %i.", enabled);
+    return YES;
 }
 
 - (NSArray *)eqPresets
 {
     int i;
-    long numPresets = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"kocl:type('cEQP'), '----':(), &subj:()" eventClass:@"core" eventID:@"cnte" appPSN:iTunesPSN];
+    SInt32 numPresets = [ITSendAEWithString(@"kocl:type('cEQP'), '----':(), &subj:()", 'core', 'cnte', &savedPSN) int32Value];
     NSMutableArray *presets = [[NSMutableArray alloc] initWithCapacity:numPresets];
-    
+    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:iTunesPSN];
+        NSString *theObj = [ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('pnam'), from:obj { form:'indx', want:type('cEQP'), seld:long(%lu), from:'null'() } }", i], 'core', 'getd', &savedPSN) stringValue];
         if (theObj) {
+            ITDebugLog(@"Adding preset %@", theObj);
             [presets addObject:theObj];
         }
     }
+    ITDebugLog(@"Done getting EQ presets");
     return [presets autorelease];
 }
 
 - (int)currentEQPresetIndex
 {
     int result;
-    result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pidx" fromObjectByKey:@"pEQP" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
+    ITDebugLog(@"Getting current EQ preset index.");
+    result = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pidx'), from:obj { form:'prop', want:type('prop'), seld:type('pEQP'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+    ITDebugLog(@"Getting current EQ preset index done.");
     return result;
 }
 
 - (float)volume
 {
-    long vol = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pVol" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
-    return vol / 100;
+    ITDebugLog(@"Getting volume.");
+    ITDebugLog(@"Getting volume done.");
+    return (float)[ITSendAEWithKey('pVol', 'core', 'getd', &savedPSN) int32Value] / 100;
 }
 
 - (BOOL)setVolume:(float)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:iTunesPSN];
-    return NO;
+    ITDebugLog(@"Setting volume to %f.", volume);
+	ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pVol'), from:'null'() }", (long)(volume * 100)], 'core', 'setd', &savedPSN);
+    ITDebugLog(@"Setting volume to %f done.", volume);
+    return YES;
 }
 
 - (BOOL)shuffleEnabled
 {
-    int result = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pShf" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
-    return result;
+	int result;
+    ITDebugLog(@"Getting shuffle enabled status.");
+	if (![self isPlaying]) {
+		ITDebugLog(@"No current playlist, getting shuffle status from visible playlist.");
+		result = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPly'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } } }", 'core', 'getd', &savedPSN) int32Value];
+	} else {
+		result = (int)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value];
+	}
+    ITDebugLog(@"Getting shuffle enabled status done.");
+    return (result != 0);
 }
 
 - (BOOL)setShuffleEnabled:(BOOL)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'() } }",enabled] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
+    ITDebugLog(@"Set shuffle enabled to %i", enabled);
+	if (![self isPlaying]) {
+		ITDebugLog(@"No current playlist, setting shuffle status on visible playlist.");
+		ITSendAEWithString([NSString stringWithFormat:@"data:long(%lu), '----':obj { form:'prop', want:type('prop'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPly'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } } }", (unsigned long)enabled], 'core', 'setd', &savedPSN);
+	} else {
+		ITSendAEWithString([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], 'core', 'setd', &savedPSN);
+	}
+    ITDebugLog(@"Set shuffle enabled to %i done", enabled);
+    return YES;
 }
 
 - (ITMTRemotePlayerRepeatMode)repeatMode
 {
-    FourCharCode m00f;
-    int result;
-    m00f = [[ITAppleEventCenter sharedCenter]
-                sendTwoTierAEWithRequestedKeyForNumber:@"pRpt" fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" appPSN:iTunesPSN];
-
+    FourCharCode m00f = 0;
+    int result = 0;
+	ITDebugLog(@"Getting repeat mode.");
+    m00f = (FourCharCode)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }", 'core', 'getd', &savedPSN) typeCodeValue];
+	
+	if (m00f == 0) {
+		ITDebugLog(@"No current playlist, getting repeat mode from visible playlist.");
+		m00f = (FourCharCode)[ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPly'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } } }", 'core', 'getd', &savedPSN) typeCodeValue];
+	}
+	
     switch (m00f)
-	   {
-	   case 'kRp0':
-		  result = ITMTRemotePlayerRepeatOff;
-		  break;
-	   case 'kRp1':
-		  result = ITMTRemotePlayerRepeatOne;
-		  break;
-	   case 'kRpA':
-		  result = ITMTRemotePlayerRepeatAll;
-		  break;
-	   }
-    
+    {
+        //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
 {
-    FourCharCode m00f;
+    char *m00f;
+    ITDebugLog(@"Setting repeat mode to %i", repeatMode);
     switch (repeatMode)
-	   {
-	   case ITMTRemotePlayerRepeatOff:
-		  m00f = 'kRp0';
-		  break;
-	   case ITMTRemotePlayerRepeatOne:
-		  m00f = 'kRp1';
-		  break;
-	   case ITMTRemotePlayerRepeatAll:
-		  m00f = 'kRpA';
-		  break;
-	   }
-
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"data:long(%lu) ----:obj { form:'prop', want:type('pRpt'), seld:type('pShf'), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:'null'() } }",m00f] eventClass:@"core" eventID:@"setd" appPSN:iTunesPSN];
-
+    {
+        case ITMTRemotePlayerRepeatOne:
+            m00f = "kRp1";
+            break;
+        case ITMTRemotePlayerRepeatAll:
+            m00f = "kRpA";
+            break;
+        case ITMTRemotePlayerRepeatOff:
+        default:
+            m00f = "kRp0";
+            break;
+    }
+	if (![self isPlaying]) {
+		ITDebugLog(@"No current playlist, setting repeat mode on visible playlist.");
+		ITSendAEWithString([NSString stringWithFormat:@"data:'%s', '----':obj { form:'prop', want:type('prop'), seld:type('pRpt'), from:obj { form:'prop', want:type('prop'), seld:type('pPly'), from:obj { form:'indx', want:type('cBrW'), seld:1, from:'null'() } } }", m00f], 'core', 'setd', &savedPSN);
+	} else {
+		ITSendAEWithString([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], 'core', 'setd', &savedPSN);
+	}
+    ITDebugLog(@"Setting repeat mode to %c done", m00f);
+    return YES;
 }
 
 - (BOOL)play
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play" appPSN:iTunesPSN];
+    ITDebugLog(@"Play");
+	ITSendAE('hook', 'Play', &savedPSN);
+    ITDebugLog(@"Play done");
     return YES;
 }
 
 - (BOOL)pause
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus" appPSN:iTunesPSN];
+    ITDebugLog(@"Pause");
+    ITSendAE('hook', 'Paus', &savedPSN);
+    ITDebugLog(@"Pause done");
     return YES;
 }
 
 - (BOOL)goToNextSong
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next" appPSN:iTunesPSN];
+    ITDebugLog(@"Go to next track");
+    ITSendAE('hook', 'Next', &savedPSN);
+    ITDebugLog(@"Go to next track done");
     return YES;
 }
 
 - (BOOL)goToPreviousSong
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev" appPSN:iTunesPSN];
+    ITDebugLog(@"Go to previous track");
+    ITSendAE('hook', 'Back', &savedPSN);
+    ITDebugLog(@"Go to previous track done");
     return YES;
 }
 
 - (BOOL)forward
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Fast" appPSN:iTunesPSN];
+    ITDebugLog(@"Fast forward action");
+    ITSendAE('hook', 'Fast', &savedPSN);
+    ITDebugLog(@"Fast forward action done");
     return YES;
 }
 
 - (BOOL)rewind
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Rwnd" appPSN:iTunesPSN];
+    ITDebugLog(@"Rewind action");
+    ITSendAE('hook', 'Rwnd', &savedPSN);
+    ITDebugLog(@"Rewind action done");
     return YES;
 }
 
 - (BOOL)switchToPlaylistAtIndex:(int)index
 {
-    [[ITAppleEventCenter sharedCenter] sendAEWithSendString:[NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }",index] eventClass:@"hook" eventID:@"Play" appPSN:iTunesPSN];
+    ITDebugLog(@"Switching to playlist at index %i", index);
+	ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cPly'), seld:long(%lu), from:() }", index], 'hook', 'Play', &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);
+	ITSendAEWithString([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], 'hook', 'Play', &savedPSN);
+    ITDebugLog(@"Done switching to playlist at index %i of source %i", index, index2);
     return YES;
 }
 
 - (BOOL)switchToSongAtIndex:(int)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:iTunesPSN];
+    ITDebugLog(@"Switching to track at index %i", index);
+	ITSendAEWithString([NSString stringWithFormat:@"'----':obj { form:'indx', want:type('cTrk'), seld:long(%lu), from:obj { form:'prop', want:type('prop'), seld:type('pPla'), from:() } }", index], 'hook' ,'Play', &savedPSN);
+    ITDebugLog(@"Done switching to track at index %i", index);
     return YES;
 }
 
 - (BOOL)switchToEQAtIndex:(int)index
 {
+    ITDebugLog(@"Switching to EQ preset at index %i", index);
     // index should count from 0, but itunes counts from 1, so let's add 1.
-    [[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:iTunesPSN];
+    [self setEqualizerEnabled:YES];
+	ITSendAEWithString([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)], 'core', 'setd', &savedPSN);
+    ITDebugLog(@"Done switching to EQ preset at index %i", index);
     return YES;
 }
 
+- (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];
+    
+    //Enabled fixed indexing
+    ITSendAEWithString(@"data:long(1), '----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", 'core', 'setd', &savedPSN);
+    
+    //Search for the term
+    NSAppleEventDescriptor *searchResults = ITSendAEWithString([NSString stringWithFormat:@"pTrm:\"%@\", pAre:'%@', '----':obj { form:'indx', want:type('cPly'), seld:long(1), from:obj { form:'indx', want:type('cSrc'), seld:long(1), from:'null'() } }", term, ((type == 1) ? @"kSrR" : @"kSrL")], 'hook', 'Srch', &savedPSN);
+    
+    //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:'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);
+        }
+    } else {
+        //Create MenuTunes playlist
+        ITSendAEWithString(@"prdt:{ pnam:\"MenuTunes\" }, kocl:type('cPly'), &subj:()", 'core', 'crel', &savedPSN);
+    }
+    
+    //Duplicate search results to playlist
+    for (i = 1; i <= [searchResults numberOfItems]; i++) {
+		//NSLog(@"%@", ITSendAEWithStringAndParameter(@"'----':obj { form:'prop', want:type('prop'), seld:prop('pnam'), from:aevt(@) }", *[[searchResults descriptorAtIndex:i] aeDesc], 'core', 'getd', &savedPSN));
+		
+        ITSendAEWithStringAndObject(@"insh:obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", [[searchResults descriptorAtIndex:i] aeDesc], 'core', 'clon', &savedPSN);
+    }
+    //Reset fixed indexing
+    ITSendAEWithString([NSString stringWithFormat:@"data:long(%i), '----':obj { form:'prop', want:type('prop'), seld:type('pFix'), from:'null'() }", fixed], 'core', 'setd', &savedPSN);
+    
+    //Play MenuTunes playlist
+    ITSendAEWithString(@"'----':obj { form:'name', want:type('cPly'), seld:\"MenuTunes\", from:'null'() }", 'hook', 'Play', &savedPSN);
+    
+    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) typeCodeValue] != 'prop');
+}
+
+- (void)notificationHandler:(NSNotification *)note
+{
+	ITDebugLog(@"Received notification: %@", note);
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTTrackChanged" object:self userInfo:[note userInfo]];
+	ITDebugLog(@"Handled notification.");
+}
+
 - (ProcessSerialNumber)iTunesPSN
 {
-    NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
+    /*NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
     ProcessSerialNumber number;
     int i;
     int count = [apps count];
@@ -400,28 +1059,52 @@
                 @"NSApplicationProcessSerialNumberLow"] intValue];
         }
     }
+    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' highLPongOfPSN: %lu.", number.highLongOfPSN);
+                ITDebugLog(@"iTunes' lowLongOfPSN: %lu.", number.lowLongOfPSN);
+                ITDebugLog(@"Done getting iTunes' PSN.");
+				[(NSString *)name release];
+                return number;
+            }
+            [(NSString *)name release];
+        }
+    }
+    ITDebugLog(@"Failed getting iTunes' PSN.");
     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];
+- (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;
 }
-
-- (void)applicationTerminated:(NSNotification *)note
-{
-    NSDictionary *info = [note userInfo];
-
-    if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
-        iTunesPSN.highLongOfPSN = kNoProcess;
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+- (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];
     }
 }