From beebd024ae0457a22ab8f289f890ead9f6db399e Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Wed, 24 Nov 2004 00:33:24 +0000 Subject: [PATCH] Added support for the new iTunes distributed object notification. It is caught at iTunesRemote, which then sends a notification. MainController will switch over from polling to the new method as soon as it receives the first notification. One side effect of this is that the "No Song Playing." status window no longer shows when iTunes stops, but that's just too bad. I also added an option to keep polling, as default "UsePollingOnly" When using the distributed notifications, I disable disabling the status item when iTunes stops responding, and instead throw a menu saying iTunes is not responding. --- MainController.h | 3 +- MainController.m | 158 +++++++++++++++++++++++++++++++++++++++++------ iTunesRemote.m | 9 +++ 3 files changed, 149 insertions(+), 21 deletions(-) diff --git a/MainController.h b/MainController.h index 9b1b359..fde9761 100755 --- a/MainController.h +++ b/MainController.h @@ -35,6 +35,7 @@ //Used in updating the menu automatically NSTimer *refreshTimer; NSString *_latestSongIdentifier, *_toolTip; + NSDictionary *_lastTrackInfo; StatusWindowController *statusWindowController; //Shows status windows MenuController *menuController; @@ -43,7 +44,7 @@ MTBlingController *bling; NSTimer *registerTimer; - BOOL timerUpdating, _checkingForServer, _popped; + BOOL timerUpdating, _checkingForServer, _popped, _open; BOOL blinged; NSLock *_serverCheckLock; } diff --git a/MainController.m b/MainController.m index 44e766b..3b9342b 100755 --- a/MainController.m +++ b/MainController.m @@ -173,11 +173,19 @@ static MainController *sharedController; [networkController startRemoteServerSearch]; [NSApp deactivate]; + [self performSelector:@selector(rawr) withObject:nil afterDelay:1.0]; } -- (void)applicationDidBecomeActive:(NSNotification *)note +- (void)rawr { - [[MainController sharedController] showPreferences]; + _open = YES; +} + +- (void)applicationWillBecomeActive:(NSNotification *)note +{ + if (_open) { + [[MainController sharedController] showPreferences]; + } } - (ITMTRemote *)loadRemote @@ -283,6 +291,8 @@ static MainController *sharedController; [self clearHotKeys]; if ([refreshTimer isValid]) { [refreshTimer invalidate]; + [refreshTimer release]; + refreshTimer = nil; } [statusWindowController showRegistrationQueryWindow]; } @@ -443,12 +453,18 @@ static MainController *sharedController; { ITDebugLog(@"Menu clicked."); - if ( ([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning ) { - if ([statusItem isEnabled]) { - [statusItem setToolTip:@"iTunes not responding."]; - [[ITHotKeyCenter sharedCenter] setEnabled:NO]; + if (([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning) { + if (refreshTimer) { + if ([statusItem isEnabled]) { + [statusItem setToolTip:@"iTunes not responding."]; + [[ITHotKeyCenter sharedCenter] setEnabled:NO]; + } + [statusItem setEnabled:NO]; + } else { + NSMenu *menu = [[NSMenu alloc] init]; + [menu addItemWithTitle:@"iTunes Not Responding" action:nil keyEquivalent:@""]; + [statusItem setMenu:[menu autorelease]]; } - [statusItem setEnabled:NO]; return; } else if (![statusItem isEnabled]) { [statusItem setEnabled:YES]; @@ -473,6 +489,81 @@ static MainController *sharedController; NS_ENDHANDLER } +- (void)trackChanged:(NSNotification *)note +{ + //If we're running the timer, shut it off since we don't need it! + if (refreshTimer && [refreshTimer isValid]) { + ITDebugLog(@"Invalidating refresh timer."); + [refreshTimer invalidate]; + [refreshTimer release]; + refreshTimer = nil; + } + + if (![self songChanged]) { + return; + } + NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier]; + if ( [df boolForKey:@"showSongInfoOnChange"] ) { + [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0]; + } + [_lastTrackInfo release]; + _lastTrackInfo = [[note userInfo] retain]; + + [self setLatestSongIdentifier:identifier]; + ITDebugLog(@"The song changed. '%@'", _latestSongIdentifier); + if ([df boolForKey:@"runScripts"]) { + NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]]; + NSEnumerator *scriptsEnum = [scripts objectEnumerator]; + NSString *nextScript; + ITDebugLog(@"Running AppleScripts for song change."); + while ( (nextScript = [scriptsEnum nextObject]) ) { + NSDictionary *error; + NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error]; + ITDebugLog(@"Running script: %@", nextScript); + if (!currentScript || ![currentScript executeAndReturnError:nil]) { + ITDebugLog(@"Error running script %@.", nextScript); + } + [currentScript release]; + } + } + + [statusItem setEnabled:NO]; + + NS_DURING + latestPlaylistClass = [[self currentRemote] currentPlaylistClass]; + + if ([menuController rebuildSubmenus]) { + /*if ( [df boolForKey:@"showSongInfoOnChange"] ) { + [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0]; + }*/ + [self setLatestSongIdentifier:identifier]; + //Create the tooltip for the status item + if ( [df boolForKey:@"showToolTip"] ) { + ITDebugLog(@"Creating status item tooltip."); + NSString *artist = [_lastTrackInfo objectForKey:@"Artist"], *title = [_lastTrackInfo objectForKey:@"Name"]; + if (artist) { + _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title]; + } else if (title) { + _toolTip = title; + } else { + _toolTip = @"No Song Playing"; + } + [statusItem setToolTip:_toolTip]; + } else { + [statusItem setToolTip:nil]; + } + } + NS_HANDLER + [self networkError:localException]; + NS_ENDHANDLER + timerUpdating = NO; + [statusItem setEnabled:YES]; + + if ([networkController isConnectedToServer]) { + [statusItem setMenu:([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) ? [menuController menu] : [menuController menuForNoPlayer]]; + } +} + // // // Menu Selectors @@ -496,7 +587,9 @@ static MainController *sharedController; [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)nextSong @@ -507,7 +600,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)prevSong @@ -518,7 +613,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)fastForward @@ -529,7 +626,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)rewind @@ -540,7 +639,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)selectPlaylistAtIndex:(int)index @@ -552,7 +653,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)selectSongAtIndex:(int)index @@ -563,7 +666,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)selectSongRating:(int)rating @@ -574,7 +679,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)selectEQPresetAtIndex:(int)index @@ -589,7 +696,9 @@ static MainController *sharedController; NS_HANDLER [self networkError:localException]; NS_ENDHANDLER - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + } } - (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type @@ -1238,8 +1347,9 @@ static MainController *sharedController; [self setupHotKeys]; //playerRunningState = ITMTRemotePlayerRunning; playerRunningState = [[self currentRemote] playerRunningState]; - - [refreshTimer invalidate]; + if (refreshTimer) { + [refreshTimer invalidate]; + } refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5) target:self selector:@selector(timerUpdate) @@ -1273,7 +1383,9 @@ static MainController *sharedController; } else { [self applicationTerminated:nil]; } - [self timerUpdate]; + if (refreshTimer) { + [self timerUpdate]; + }; return YES; } @@ -1384,6 +1496,9 @@ static MainController *sharedController; userInfo:nil repeats:YES] retain]; //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil]; + if (![df boolForKey:@"UsePollingOnly"]) { + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(trackChanged:) name:@"ITMTTrackChanged" object:nil]; + } [self setupHotKeys]; } NS_HANDLER @@ -1401,10 +1516,12 @@ static MainController *sharedController; [refreshTimer invalidate]; [refreshTimer release]; refreshTimer = nil; + [[NSNotificationCenter defaultCenter] removeObserver:self]; [statusItem setEnabled:YES]; [statusItem setToolTip:@"iTunes not running."]; [self clearHotKeys]; - + + if ([df objectForKey:@"ShowPlayer"] != nil) { ITHotKey *hotKey; ITDebugLog(@"Setting up show player hot key."); @@ -1429,6 +1546,7 @@ static MainController *sharedController; - (void)applicationWillTerminate:(NSNotification *)note { + [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; [networkController stopRemoteServerSearch]; [self clearHotKeys]; [[NSStatusBar systemStatusBar] removeStatusItem:statusItem]; diff --git a/iTunesRemote.m b/iTunesRemote.m index a741164..5108701 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -26,12 +26,14 @@ { ITDebugLog(@"iTunesRemote begun"); savedPSN = [self iTunesPSN]; + [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(notificationHandler:) name:@"com.apple.iTunes.playerInfo" object:@"com.apple.iTunes.player"]; return YES; } - (BOOL)halt { ITDebugLog(@"iTunesRemote halted"); + [[NSDistributedNotificationCenter defaultCenter] removeObserver:self]; return YES; } @@ -822,6 +824,13 @@ return ([ITSendAEWithString(@"'----':obj { form:'prop', want:type('prop'), seld:type('pcls'), from:obj { form:'prop', want:type('prop'), seld:type('pTrk'), from:'null'() } }", 'core', 'getd', &savedPSN) int32Value] != 'prop'); } +- (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]; -- 2.20.1