- (void)setLatestSongIdentifier:(NSString *)newIdentifier;
- (void)applicationLaunched:(NSNotification *)note;
- (void)applicationTerminated:(NSNotification *)note;
+
+- (void)invalidateStatusWindowUpdateTimer;
@end
static MainController *sharedController;
if ( ( self = [super init] ) ) {
sharedController = self;
+ _statusWindowUpdateTimer = nil;
+
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
[[PreferencesController sharedPrefs] setController:self];
statusWindowController = [StatusWindowController sharedController];
- (void)applicationDidFinishLaunching:(NSNotification *)note
{
+ NSString *iTunesPath = [df stringForKey:@"CustomPlayerPath"];
+ NSDictionary *iTunesInfoPlist;
+ float iTunesVersion;
+
//Turn on debug mode if needed
- if ([df boolForKey:@"ITDebugMode"]) {
+ /*if ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)
+ if ((GetCurrentKeyModifiers() & (optionKey | rightOptionKey)) != 0)
+ if ((GetCurrentKeyModifiers() & (shiftKey | rightShiftKey)) != 0)*/
+ if ([df boolForKey:@"ITDebugMode"] || ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)) {
SetITDebugMode(YES);
+ [[StatusWindowController sharedController] showDebugModeEnabledWindow];
}
-
+
+ //Check if iTunes 4.7 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);
+ if (iTunesVersion >= 4.7) {
+ _needsPolling = NO;
+ } else {
+ _needsPolling = YES;
+ }
+
if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
[df removePersistentDomainForName:@"com.ithinksw.menutunes"];
[df synchronize];
_open = YES;
}
-- (void)applicationDidBecomeActive:(NSNotification *)note
-{
- if (_open && !blinged && ![NSApp mainWindow] && ![[StatusWindow sharedWindow] isVisible]) {
- [[MainController sharedController] showPreferences];
- }
-}
-
- (ITMTRemote *)loadRemote
{
NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
if (blinged) {
[statusItem setEnabled:YES];
[[ITHotKeyCenter sharedCenter] setEnabled:YES];
- if (![refreshTimer isValid]) {
+ if (_needsPolling && ![refreshTimer isValid]) {
[refreshTimer release];
refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
target:self
if (refreshTimer && identifier == nil) {
if ([statusItem isEnabled]) {
[statusItem setToolTip:@"iTunes not responding."];
- [[ITHotKeyCenter sharedCenter] setEnabled:NO];
}
[statusItem setEnabled:NO];
return;
} else if (![statusItem isEnabled]) {
[statusItem setEnabled:YES];
[statusItem setToolTip:_toolTip];
- [[ITHotKeyCenter sharedCenter] setEnabled:YES];
return;
}
if (refreshTimer) {
if ([statusItem isEnabled]) {
[statusItem setToolTip:NSLocalizedString(@"iTunesNotResponding", @"iTunes is not responding.")];
- [[ITHotKeyCenter sharedCenter] setEnabled:NO];
}
[statusItem setEnabled:NO];
} else {
} else if (![statusItem isEnabled]) {
[statusItem setEnabled:YES];
[statusItem setToolTip:_toolTip];
- [[ITHotKeyCenter sharedCenter] setEnabled:YES];
return;
}
- (void)trackChanged:(NSNotification *)note
{
//If we're running the timer, shut it off since we don't need it!
- if (refreshTimer && [refreshTimer isValid]) {
+ /*if (refreshTimer && [refreshTimer isValid]) {
ITDebugLog(@"Invalidating refresh timer.");
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
- }
+ }*/
if (![self songChanged]) {
return;
{
ITDebugLog(@"Show preferences.");
[[PreferencesController sharedPrefs] showPrefsWindow:self];
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
}
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+ if ([df objectForKey:@"ToggleShufflability"] != nil) {
+ ITDebugLog(@"Setting up toggle song shufflability hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"ToggleShufflability"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShufflability"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(toggleSongShufflable)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
if ([df objectForKey:@"PopupMenu"] != nil) {
ITDebugLog(@"Setting up popup menu hot key.");
hotKey = [[ITHotKey alloc] init];
NSImage *art = nil;
int rating = -1;
int playCount = -1;
-
+
+ //If we're already visible and the setting says so, vanish instead of displaying again.
+ if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+ ITDebugLog(@"Track window is already visible, hiding track window.");
+ [self invalidateStatusWindowUpdateTimer];
+ [[StatusWindow sharedWindow] vanish:nil];
+ return;
+ }
+
ITDebugLog(@"Showing track info status window.");
NS_DURING
if ( title ) {
if ( [df boolForKey:@"showAlbumArtwork"] ) {
- NSSize oldSize, newSize;
- NS_DURING
- art = [[self currentRemote] currentSongAlbumArt];
- oldSize = [art size];
- if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
- else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
- art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
- NS_HANDLER
- [self networkError:localException];
- NS_ENDHANDLER
+ NSSize oldSize, newSize;
+ NS_DURING
+ art = [[self currentRemote] currentSongAlbumArt];
+ oldSize = [art size];
+ if (oldSize.width > oldSize.height) {
+ newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+ }
+ else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+ art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
}
if ( [df boolForKey:@"showAlbum"] ) {
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
+ _timeUpdateCount = 0;
+ [self invalidateStatusWindowUpdateTimer];
+ _statusWindowUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
}
if ( [df boolForKey:@"showTrackNumber"] ) {
image:art];
}
+- (void)updateTime:(NSTimer *)timer
+{
+ StatusWindow *sw = [StatusWindow sharedWindow];
+ _timeUpdateCount++;
+ if (_timeUpdateCount < (int)[sw exitDelay] + (int)[[sw exitEffect] effectTime] + (int)[[sw entryEffect] effectTime]) {
+ NSString *time = nil, *length;
+ NS_DURING
+ length = [[self currentRemote] currentSongLength];
+ if (length) {
+ time = [NSString stringWithFormat:@"%@: %@ / %@",
+ NSLocalizedString(@"time", @"Time"),
+ [[self currentRemote] currentSongElapsed],
+ length];
+ [[StatusWindowController sharedController] updateTime:time];
+ }
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ } else {
+ [self invalidateStatusWindowUpdateTimer];
+ }
+}
+
+- (void)invalidateStatusWindowUpdateTimer
+{
+ if (_statusWindowUpdateTimer) {
+ [_statusWindowUpdateTimer invalidate];
+ _statusWindowUpdateTimer = nil;
+ }
+}
+
- (void)showUpcomingSongs
{
int numSongs = 0;
[self networkError:localException];
NS_ENDHANDLER
+ [self invalidateStatusWindowUpdateTimer];
+
ITDebugLog(@"Showing upcoming songs status window.");
NS_DURING
if (numSongs > 0) {
int curTrack = [[self currentRemote] currentSongIndex];
int i;
- for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
- if (i <= numSongs) {
+ for (i = curTrack + 1; i <= curTrack + numSongsInAdvance && i <= numSongs; i++) {
+ if ([[self currentRemote] songEnabledAtIndex:i]) {
[songList addObject:[[self currentRemote] songTitleAtIndex:i]];
- }
+ } else {
+ numSongsInAdvance++;
+ }
}
if ([songList count] == 0) {
[[self currentRemote] setVolume:volume];
// Show volume status window
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showVolumeWindowWithLevel:dispVol];
NS_HANDLER
[self networkError:localException];
[[self currentRemote] setVolume:volume];
//Show volume status window
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showVolumeWindowWithLevel:dispVol];
NS_HANDLER
[self networkError:localException];
[[self currentRemote] setCurrentSongRating:rating];
//Show rating status window
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showRatingWindowWithRating:rating];
NS_HANDLER
[self networkError:localException];
[[self currentRemote] setCurrentSongRating:rating];
//Show rating status window
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showRatingWindowWithRating:rating];
NS_HANDLER
[self networkError:localException];
- (void)setRating:(ITHotKey *)sender
{
- int stars = [[sender name] characterAtIndex:9] - 48;
- [self selectSongRating:stars * 20];
- [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+ if ([self songIsPlaying]) {
+ int stars = [[sender name] characterAtIndex:9] - 48;
+ [self selectSongRating:stars * 20];
+ [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+ }
}
- (void)toggleLoop
[[self currentRemote] setRepeatMode:repeatMode];
//Show loop status window
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showRepeatWindowWithMode:repeatMode];
NS_HANDLER
[self networkError:localException];
[[self currentRemote] setShuffleEnabled:newShuffleEnabled];
//Show shuffle status window
ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+ [self invalidateStatusWindowUpdateTimer];
[statusWindowController showShuffleWindow:newShuffleEnabled];
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
}
+- (void)toggleSongShufflable
+{
+ if ([self songIsPlaying]) {
+ NS_DURING
+ BOOL flag = ![[self currentRemote] currentSongShufflable];
+ ITDebugLog(@"Toggling shufflability.");
+ [[self currentRemote] setCurrentSongShufflable:flag];
+ //Show song shufflability status window
+ [self invalidateStatusWindowUpdateTimer];
+ [statusWindowController showSongShufflabilityWindow:flag];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ }
+}
+
- (void)registerNowOK
{
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
- (void)registerNowCancel
{
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
[self setupHotKeys];
//playerRunningState = ITMTRemotePlayerRunning;
playerRunningState = [[self currentRemote] playerRunningState];
- if (refreshTimer) {
- [refreshTimer invalidate];
+ if (_needsPolling) {
+ if (refreshTimer) {
+ [refreshTimer invalidate];
+ }
+ refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+ target:self
+ selector:@selector(timerUpdate)
+ userInfo:nil
+ repeats:YES] retain];
}
- refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
- target:self
- selector:@selector(timerUpdate)
- userInfo:nil
- repeats:YES] retain];
[self timerUpdate];
ITDebugLog(@"Connection successful.");
return 1;
- (void)remoteServerFound:(id)sender
{
if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+ [self invalidateStatusWindowUpdateTimer];
[[StatusWindowController sharedController] showReconnectQueryWindow];
}
}
ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
if ( ((exception == nil) || [[exception name] isEqualToString:NSPortTimeoutException]) && [networkController isConnectedToServer]) {
//NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
+ [self invalidateStatusWindowUpdateTimer];
[[StatusWindowController sharedController] showNetworkErrorQueryWindow];
if ([self disconnectFromServer]) {
[[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
[NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
}*/
[self checkForRemoteServerAndConnectImmediately:YES];
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
}
- (void)cancelReconnect
{
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
}
[[self currentRemote] begin];
[self setLatestSongIdentifier:@""];
[self timerUpdate];
- refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
- target:self
- selector:@selector(timerUpdate)
- userInfo:nil
- repeats:YES] retain];
+ if (_needsPolling) {
+ refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+ target:self
+ selector:@selector(timerUpdate)
+ 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];
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
- [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:@"ITMTTrackChanged" object:nil];
[statusItem setEnabled:YES];
[statusItem setToolTip:@"iTunes not running."];
[self clearHotKeys];
[[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
}
+- (void)applicationDidBecomeActive:(NSNotification *)note
+{
+ //This appears to not work in 10.4
+ if (_open && !blinged && ![[ITAboutWindowController sharedController] isVisible] && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
+ [[MainController sharedController] showPreferences];
+ }
+}
/*************************************************************************/
#pragma mark -
git.ithinksw.org / MenuTunes.git / blobdiff