#import <ITKit/ITCategory-NSMenu.h>
#import "StatusWindow.h"
#import "StatusWindowController.h"
+#import "AudioscrobblerController.h"
#import "StatusItemHack.h"
@interface NSMenu (MenuImpl)
- (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;
+ _audioscrobblerTimer = nil;
+
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
[[PreferencesController sharedPrefs] setController:self];
statusWindowController = [StatusWindowController sharedController];
menuController = [[MenuController alloc] init];
df = [[NSUserDefaults standardUserDefaults] retain];
timerUpdating = NO;
- blinged = NO;
}
return self;
}
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
currentRemote = [self loadRemote];
[[self currentRemote] begin];
+ [[self currentRemote] currentSongElapsed];
+
//Turn on network stuff if needed
networkController = [[NetworkController alloc] init];
if ([df boolForKey:@"enableSharing"]) {
withLength:NSSquareStatusItemLength];
}
- /*bling = [[MTBlingController alloc] init];
- [self blingTime];
- registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0
- target:self
- selector:@selector(blingTime)
- userInfo:nil
- repeats:YES] retain];*/
-
NS_DURING
if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
[self applicationLaunched:nil];
[statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
[statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
+ if ([df boolForKey:@"audioscrobblerEnabled"]) {
+ if ([PreferencesController getKeychainItemPasswordForUser:[df stringForKey:@"audioscrobblerUser"]] != nil) {
+ [[AudioscrobblerController sharedController] attemptHandshake:NO];
+ }
+ }
+
[networkController startRemoteServerSearch];
[NSApp deactivate];
[self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];
-
- bling = [[MTBlingController alloc] init];
- [self blingTime];
- registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0
- target:self
- selector:@selector(blingTime)
- userInfo:nil
- repeats:YES] retain];
}
- (void)rawr
[pool release];
}*/
-- (void)setBlingTime:(NSDate*)date
-{
- NSMutableDictionary *globalPrefs;
- [df synchronize];
- globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
- if (date) {
- [globalPrefs setObject:date forKey:@"ITMTTrialStart"];
- [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];
- } else {
- [globalPrefs removeObjectForKey:@"ITMTTrialStart"];
- [globalPrefs removeObjectForKey:@"ITMTTrialVers"];
- }
- [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
- [df synchronize];
- [globalPrefs release];
-}
-
-- (NSDate*)getBlingTime
-{
- [df synchronize];
- return [[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialStart"];
-}
-
-- (void)blingTime
-{
- NSDate *now = [NSDate date];
- if (![self blingBling]) {
- if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
- [self setBlingTime:now];
- } else if ([[[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialVers"] intValue] < MT_CURRENT_VERSION) {
- if ([now timeIntervalSinceDate:[self getBlingTime]] >= 345600) {
- [self setBlingTime:[now addTimeInterval:-259200]];
- } else {
- NSMutableDictionary *globalPrefs;
- [df synchronize];
- globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
- [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];
- [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
- [df synchronize];
- [globalPrefs release];
- }
- }
-
- if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) && (blinged != YES) ) {
- blinged = YES;
- [statusItem setEnabled:NO];
- [[ITHotKeyCenter sharedCenter] setEnabled:NO];
- if ([refreshTimer isValid]) {
- [refreshTimer invalidate];
- [refreshTimer release];
- refreshTimer = nil;
- }
- [statusWindowController showRegistrationQueryWindow];
- }
- } else {
- if (blinged) {
- [statusItem setEnabled:YES];
- [[ITHotKeyCenter sharedCenter] setEnabled:YES];
- if (_needsPolling && ![refreshTimer isValid]) {
- [refreshTimer release];
- refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
- target:self
- selector:@selector(timerUpdate)
- userInfo:nil
- repeats:YES] retain];
- }
- blinged = NO;
- }
- [self setBlingTime:nil];
- }
-}
-
-- (void)blingNow
-{
- [bling showPanel];
-}
-
-- (BOOL)blingBling
-{
- if ( ! ([bling checkDone] == 2475) ) {
- return NO;
- } else {
- return YES;
- }
-}
-
- (BOOL)songIsPlaying
{
NSString *identifier = nil;
- (BOOL)radioIsPlaying
{
- ITMTRemotePlayerPlaylistClass class = nil;
+ ITMTRemotePlayerPlaylistClass class = ITMTRemotePlayerLibraryPlaylist;
NS_DURING
class = [[self currentRemote] currentPlaylistClass];
NS_HANDLER
- (void)timerUpdate
{
- NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+ NSString *identifier = nil;
+ NS_DURING
+ identifier = [[self currentRemote] playerStateUniqueIdentifier];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
if (refreshTimer && identifier == nil) {
if ([statusItem isEnabled]) {
[statusItem setToolTip:@"iTunes not responding."];
[statusItem setToolTip:nil];
}
}
+
+ if ([df boolForKey:@"audioscrobblerEnabled"]) {
+ int length = [[self currentRemote] currentSongDuration];
+ if (length > 30) {
+ _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+ [_audioscrobblerTimer invalidate];
+ [_audioscrobblerTimer release];
+ _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+ [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+ }
+ } else {
+ _audioscrobblerTimer = nil;
+ }
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
[statusItem setToolTip:nil];
}
}
+
+ if ([df boolForKey:@"audioscrobblerEnabled"]) {
+ int length = [[self currentRemote] currentSongDuration];
+ if (length > 30) {
+ _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+ [_audioscrobblerTimer invalidate];
+ [_audioscrobblerTimer release];
+ _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+ [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+ }
+ } else {
+ _audioscrobblerTimer = nil;
+ }
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
}
}
+- (void)submitAudioscrobblerTrack:(NSTimer *)timer
+{
+ ITDebugLog(@"Audioscrobbler: Attempting to submit current track");
+ [timer invalidate];
+ if ([df boolForKey:@"audioscrobblerEnabled"]) {
+ NS_DURING
+ int elapsed = [[self currentRemote] currentSongPlayed], length = [[self currentRemote] currentSongDuration], requiredInterval = ((length / 2 < 240) ? length / 2 : 240);
+ if ((abs(elapsed - requiredInterval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
+ NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+ if (title && artist) {
+ ITDebugLog(@"Audioscrobbler: Submitting current track");
+ [[AudioscrobblerController sharedController] submitTrack:title
+ artist:artist
+ album:[[self currentRemote] currentSongAlbum]
+ length:[[self currentRemote] currentSongDuration]];
+ }
+ } else if (requiredInterval - elapsed > 0) {
+ _audioscrobblerInterval = requiredInterval - elapsed;
+ [_audioscrobblerTimer release];
+ ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+ _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+ [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+ }
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ }
+}
+
//
//
// Menu Selectors
{
ITDebugLog(@"Show preferences.");
[[PreferencesController sharedPrefs] showPrefsWindow:self];
- [[StatusWindow sharedWindow] setLocked:NO];
+ [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
}
[hotKey setName:@"TrackInfo"];
[hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
[hotKey setTarget:self];
- [hotKey setAction:@selector(showCurrentTrackInfo)];
+ [hotKey setAction:@selector(showCurrentTrackInfoHotKey)];
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+ if ([df objectForKey:@"AlbumArt"] != nil) {
+ ITDebugLog(@"Setting up album art hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"AlbumArt"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"AlbumArt"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(showCurrentAlbumArtHotKey)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
if ([df objectForKey:@"UpcomingSongs"] != nil) {
ITDebugLog(@"Setting up upcoming songs hot key.");
hotKey = [[ITHotKey alloc] init];
[[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];
ITDebugLog(@"Finished setting up hot keys.");
}
+- (void)showCurrentTrackInfoHotKey
+{
+ //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;
+ }
+ [self showCurrentTrackInfo];
+}
+
+- (void)showCurrentAlbumArtHotKey
+{
+ //If we're already visible and the setting says so, vanish instead of displaying again.
+ if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowAlbumArtType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+ ITDebugLog(@"Art window is already visible, hiding track window.");
+ [[StatusWindow sharedWindow] vanish:nil];
+ return;
+ }
+ [self showCurrentAlbumArt];
+}
+
+- (void)showCurrentAlbumArt
+{
+ NSImage *art = nil;
+ NS_DURING
+ art = [[self currentRemote] currentSongAlbumArt];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+
+ if (art) {
+ NSSize oldSize = [art size], newSize;
+ if (oldSize.width > 300 && oldSize.height > 300) {
+ if (oldSize.width > oldSize.height) {
+ newSize = NSMakeSize(300, oldSize.height * (300.0f / oldSize.width));
+ } else {
+ newSize = NSMakeSize(oldSize.width * (300.0f / oldSize.height), 300);
+ }
+ } else {
+ newSize = oldSize;
+ }
+
+ art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+
+ [statusWindowController showAlbumArtWindowWithImage:art];
+ } else {
+ NSString *string = nil;
+ NS_DURING
+ if ([[self currentRemote] currentSongTitle]) {
+ string = NSLocalizedString(@"noAlbumArt", @"No art for current song.");
+ } else {
+ string = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
+ }
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ //Show the no song playing window if there is no album art or no track is playing
+ [statusWindowController showAlbumArtWindowWithErrorText:string];
+ }
+}
+
- (void)showCurrentTrackInfo
{
ITMTRemotePlayerSource source = 0;
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 *)[StatusWindow sharedWindow];
+ _timeUpdateCount++;
+ if ([statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [sw visibilityState] != ITWindowHiddenState) {
+ 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)registerNowOK
-{
- [[StatusWindow sharedWindow] setLocked:NO];
- [[StatusWindow sharedWindow] vanish:self];
- [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
-
- [self blingNow];
-}
-
-- (void)registerNowCancel
+- (void)toggleSongShufflable
{
- [[StatusWindow sharedWindow] setLocked:NO];
- [[StatusWindow sharedWindow] vanish:self];
- [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
-
- [NSApp terminate:self];
+ 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
+ }
}
/*************************************************************************/
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;
[networkController disconnect];
if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+ refreshTimer = nil;
[self applicationLaunched:nil];
} else {
[self applicationTerminated:nil];
}
+
if (refreshTimer) {
[self timerUpdate];
};
- (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];
}
- (void)applicationDidBecomeActive:(NSNotification *)note
{
- if (_open && !blinged && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
+ //This appears to not work in 10.4
+ if (_open && ![[ITAboutWindowController sharedController] isVisible] && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
[[MainController sharedController] showPreferences];
}
}
- (void)dealloc
{
[self applicationTerminated:nil];
- [bling release];
[statusItem release];
[statusWindowController release];
[menuController release];
git.ithinksw.org / MenuTunes.git / blobdiff