#import <ITKit/ITHotKeyCenter.h>
#import <ITKit/ITHotKey.h>
#import <ITKit/ITKeyCombo.h>
+#import <ITKit/ITCategory-NSMenu.h>
#import "StatusWindow.h"
#import "StatusWindowController.h"
#import "StatusItemHack.h"
+@interface NSCarbonMenuImpl:NSObject
+{
+ NSMenu *_menu;
+}
+
++ (void)initialize;
++ (void)setupForNoMenuBar;
+- (void)dealloc;
+- (void)setMenu:fp8;
+- menu;
+- (void)itemChanged:fp8;
+- (void)itemAdded:fp8;
+- (void)itemRemoved:fp8;
+- (void)performActionWithHighlightingForItemAtIndex:(int)fp8;
+- (void)performMenuAction:(SEL)fp8 withTarget:fp12;
+- (void)setupCarbonMenuBar;
+- (void)setAsMainCarbonMenuBar;
+- (void)clearAsMainCarbonMenuBar;
+- (void)popUpMenu:fp8 atLocation:(NSPoint)fp12 width:(float)fp20 forView:fp24 withSelectedItem:(int)fp28 withFont:fp32;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16 withFont:fp20;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16;
+- window;
+@end
+
+@implementation NSImage (SmoothAdditions)
+
+- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize
+{
+ NSImage *newImage;
+ NSImageRep *rep = [self bestRepresentationForDevice:nil];
+
+ newImage = [[NSImage alloc] initWithSize:scaledSize];
+ [newImage lockFocus];
+ {
+ [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
+ [[NSGraphicsContext currentContext] setShouldAntialias:YES];
+ [rep drawInRect:NSMakeRect(3, 3, scaledSize.width - 6, scaledSize.height - 6)];
+ }
+ [newImage unlockFocus];
+ return [newImage autorelease];
+}
+
+@end
+
@interface MainController(Private)
- (ITMTRemote *)loadRemote;
-- (void)timerUpdate;
- (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)showCurrentTrackInfo;
- (void)applicationLaunched:(NSNotification *)note;
- (void)applicationTerminated:(NSNotification *)note;
@end
sharedController = self;
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+ [[PreferencesController sharedPrefs] setController:self];
statusWindowController = [StatusWindowController sharedController];
menuController = [[MenuController alloc] init];
df = [[NSUserDefaults standardUserDefaults] retain];
- [[PreferencesController sharedPrefs] setController:self];
timerUpdating = NO;
blinged = NO;
}
SetITDebugMode(YES);
}
+ if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
+ [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
+ [df synchronize];
+ [[PreferencesController sharedPrefs] registerDefaults];
+ [[StatusWindowController sharedController] showPreferencesUpdateWindow];
+ }
+
currentRemote = [self loadRemote];
[[self currentRemote] begin];
if ([df boolForKey:@"enableSharing"]) {
[self setServerStatus:YES];
} else if ([df boolForKey:@"useSharedPlayer"]) {
- if ([self connectToServer] == 0) {
- [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
- }
+ [self checkForRemoteServerAndConnectImmediately:YES];
}
//Setup for notification of the remote player launching or quitting
name:NSWorkspaceDidLaunchApplicationNotification
object:nil];
- if ( ! [df objectForKey:@"menu"] ) { // If this is nil, defaults have never been registered.
+ if (![df objectForKey:@"menu"]) { // If this is nil, defaults have never been registered.
[[PreferencesController sharedPrefs] registerDefaults];
}
- [StatusItemHack install];
- statusItem = [[ITStatusItem alloc]
- initWithStatusBar:[NSStatusBar systemStatusBar]
- withLength:NSSquareStatusItemLength];
+ if ([df boolForKey:@"ITMTNoStatusItem"]) {
+ statusItem = nil;
+ } else {
+ [StatusItemHack install];
+ statusItem = [[ITStatusItem alloc]
+ initWithStatusBar:[NSStatusBar systemStatusBar]
+ withLength:NSSquareStatusItemLength];
+ }
bling = [[MTBlingController alloc] init];
[self blingTime];
Class remoteClass = [remoteBundle principalClass];
if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
- [remoteClass isKindOfClass:[NSObject class]]) {
+ [(NSObject *)remoteClass isKindOfClass:[NSObject class]]) {
id remote = [remoteClass remote];
ITDebugLog(@"Adding remote at path %@", bundlePath);
[remoteArray addObject:remote];
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];
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];
[self setupHotKeys];
if (![refreshTimer isValid]) {
[refreshTimer release];
- refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
+ refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
target:self
selector:@selector(timerUpdate)
userInfo:nil
- (void)setLatestSongIdentifier:(NSString *)newIdentifier
{
- ITDebugLog(@"Setting latest song identifier to %@", newIdentifier);
+ ITDebugLog(@"Setting latest song identifier:");
+ ITDebugLog(@" - Identifier: %@", newIdentifier);
[_latestSongIdentifier autorelease];
- _latestSongIdentifier = [newIdentifier copy];
+ _latestSongIdentifier = [newIdentifier retain];
}
- (void)timerUpdate
{
- if ([networkController isConnectedToServer]) {
- [statusItem setMenu:[menuController menu]];
- }
-
- if ( [self songChanged] && (timerUpdating != YES) ) {
+ if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
+ [statusItem setEnabled:NO];
+ [statusItem setToolTip:@"iTunes not responding."];
+ return;
+ } else if (![statusItem isEnabled]) {
+ [statusItem setEnabled:YES];
+ [statusItem setToolTip:_toolTip];
+ return;
+ }
+
+ if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
ITDebugLog(@"The song changed.");
+ 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];
+ }
+ }
+
timerUpdating = YES;
+ [statusItem setEnabled:NO];
NS_DURING
latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
}
[self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
+
+ //Create the tooltip for the status item
+ if ( [df boolForKey:@"showToolTip"] ) {
+ NSString *artist = [[self currentRemote] currentSongArtist];
+ NSString *title = [[self currentRemote] currentSongTitle];
+ ITDebugLog(@"Creating status item tooltip.");
+ 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]];
}
}
{
ITDebugLog(@"Selecting playlist %i", index);
NS_DURING
- [[self currentRemote] switchToPlaylistAtIndex:index];
+ [[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
+ //[[self currentRemote] switchToPlaylistAtIndex:index];
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
{
ITDebugLog(@"Selecting EQ preset %i", index);
NS_DURING
- [[self currentRemote] switchToEQAtIndex:index];
+ if (index == -1) {
+ [[self currentRemote] setEqualizerEnabled:![[self currentRemote] equalizerEnabled]];
+ } else {
+ [[self currentRemote] switchToEQAtIndex:index];
+ }
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
[self timerUpdate];
}
+- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type
+{
+ ITDebugLog(@"Making playlist with term %@, type %i", term, type);
+ NS_DURING
+ [[self currentRemote] makePlaylistWithTerm:term ofType:type];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ ITDebugLog(@"Done making playlist");
+}
+
- (void)showPlayer
{
ITDebugLog(@"Beginning show player.");
- if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
+ //if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
ITDebugLog(@"Showing player interface.");
NS_DURING
[[self currentRemote] showPrimaryInterface];
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
- } else {
+ /*} else {
ITDebugLog(@"Launching player.");
NS_DURING
- if (![[NSWorkspace sharedWorkspace] launchApplication:[[self currentRemote] playerFullName]]) {
+ NSString *path;
+ if ( (path = [df stringForKey:@"CustomPlayerPath"]) ) {
+ } else {
+ pathITDebugLog(@"Showing player interface."); = [[self currentRemote] playerFullName];
+ }
+ if (![[NSWorkspace sharedWorkspace] launchApplication:path]) {
ITDebugLog(@"Error Launching Player");
}
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
- }
+ }*/
ITDebugLog(@"Finished show player.");
}
[[PreferencesController sharedPrefs] showPrefsWindow:self];
}
+- (void)showPreferencesAndClose
+{
+ ITDebugLog(@"Show preferences.");
+ [[PreferencesController sharedPrefs] showPrefsWindow:self];
+ [[StatusWindow sharedWindow] setLocked:NO];
+ [[StatusWindow sharedWindow] vanish:self];
+ [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
- (void)showTestWindow
{
[self showCurrentTrackInfo];
//
//
+- (MenuController *)menuController
+{
+ return menuController;
+}
+
- (void)closePreferences
{
ITDebugLog(@"Preferences closed.");
- (ITMTRemote *)currentRemote
{
+ if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+ [self networkError:nil];
+ return nil;
+ }
return currentRemote;
}
ITHotKey *hotKey;
ITDebugLog(@"Setting up hot keys.");
- if (playerRunningState == ITMTRemotePlayerNotRunning) {
+ if (playerRunningState == ITMTRemotePlayerNotRunning && ![[NetworkController sharedController] isConnectedToServer]) {
return;
}
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+ if ([df objectForKey:@"FastForward"] != nil) {
+ ITDebugLog(@"Setting up fast forward hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"FastForward"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"FastForward"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(fastForward)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
+ if ([df objectForKey:@"Rewind"] != nil) {
+ ITDebugLog(@"Setting up rewind hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"Rewind"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"Rewind"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(rewind)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
if ([df objectForKey:@"ShowPlayer"] != nil) {
ITDebugLog(@"Setting up show player hot key.");
hotKey = [[ITHotKey alloc] init];
[hotKey setAction:@selector(decrementRating)];
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+
+ if ([df objectForKey:@"PopupMenu"] != nil) {
+ ITDebugLog(@"Setting up popup menu hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"PopupMenu"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PopupMenu"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(popupMenu)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
+ int i;
+ for (i = 0; i <= 5; i++) {
+ NSString *curName = [NSString stringWithFormat:@"SetRating%i", i];
+ if ([df objectForKey:curName] != nil) {
+ ITDebugLog(@"Setting up set rating %i hot key.", i);
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:curName];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:curName]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(setRating:)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+ }
ITDebugLog(@"Finished setting up hot keys.");
}
NSString *title = nil;
NSString *album = nil;
NSString *artist = nil;
+ NSString *composer = nil;
NSString *time = nil;
NSString *track = nil;
+ NSImage *art = nil;
int rating = -1;
+ int playCount = -1;
+
+ ITDebugLog(@"Showing track info status window.");
NS_DURING
source = [[self currentRemote] currentSource];
[self networkError:localException];
NS_ENDHANDLER
- ITDebugLog(@"Showing track info status window.");
-
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
+ }
+
if ( [df boolForKey:@"showAlbum"] ) {
NS_DURING
album = [[self currentRemote] currentSongAlbum];
NS_ENDHANDLER
}
+ if ( [df boolForKey:@"showComposer"] ) {
+ NS_DURING
+ composer = [[self currentRemote] currentSongComposer];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ }
+
if ( [df boolForKey:@"showTime"] ) {
NS_DURING
time = [NSString stringWithFormat:@"%@: %@ / %@",
- @"Time",
+ NSLocalizedString(@"time", @"Time"),
[[self currentRemote] currentSongElapsed],
[[self currentRemote] currentSongLength]];
NS_HANDLER
}
}
+ if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] && [[self currentRemote] currentSource] == ITMTRemoteLibrarySource ) {
+ NS_DURING
+ playCount = [[self currentRemote] currentSongPlayCount];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ }
} else {
title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
}
-
+ ITDebugLog(@"Showing current track info status window.");
[statusWindowController showSongInfoWindowWithSource:source
title:title
album:album
artist:artist
+ composer:composer
time:time
track:track
- rating:rating];
+ rating:rating
+ playCount:playCount
+ image:art];
}
- (void)showUpcomingSongs
NS_ENDHANDLER
}
+- (void)popupMenu
+{
+ if (!_popped) {
+ _popped = YES;
+ [self menuClicked];
+ NSMenu *menu = [statusItem menu];
+ [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+ _popped = NO;
+ }
+}
+
- (void)incrementVolume
{
NS_DURING
NS_ENDHANDLER
}
+- (void)setRating:(ITHotKey *)sender
+{
+ int stars = [[sender name] characterAtIndex:9] - 48;
+ [self selectSongRating:stars * 20];
+ [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+}
+
- (void)toggleLoop
{
NS_DURING
if (result == 1) {
[[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
currentRemote = [[[networkController networkObject] remote] retain];
+
+ [self setupHotKeys];
+ //playerRunningState = ITMTRemotePlayerRunning;
+ playerRunningState = [[self currentRemote] playerRunningState];
+
+ [refreshTimer invalidate];
+ 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;
[currentRemote release];
currentRemote = [remoteArray objectAtIndex:0];
[networkController disconnect];
+
+ if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+ [self applicationLaunched:nil];
+ } else {
+ [self applicationTerminated:nil];
+ }
[self timerUpdate];
return YES;
}
-- (void)checkForRemoteServer:(NSTimer *)timer
+- (void)checkForRemoteServer
+{
+ [self checkForRemoteServerAndConnectImmediately:NO];
+}
+
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately
{
ITDebugLog(@"Checking for remote server.");
+ if (!_checkingForServer) {
+ if (!_serverCheckLock) {
+ _serverCheckLock = [[NSLock alloc] init];
+ }
+ [_serverCheckLock lock];
+ _checkingForServer = YES;
+ [_serverCheckLock unlock];
+ [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:[NSNumber numberWithBool:connectImmediately]];
+ }
+}
+
+- (void)runRemoteServerCheck:(id)sender
+{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ ITDebugLog(@"Remote server check running.");
if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
ITDebugLog(@"Remote server found.");
- [timer invalidate];
- if (![networkController isConnectedToServer]) {
- [[StatusWindowController sharedController] showReconnectQueryWindow];
+ if ([sender boolValue]) {
+ [self performSelectorOnMainThread:@selector(connectToServer) withObject:nil waitUntilDone:NO];
+ } else {
+ [self performSelectorOnMainThread:@selector(remoteServerFound:) withObject:nil waitUntilDone:NO];
}
} else {
ITDebugLog(@"Remote server not found.");
+ [self performSelectorOnMainThread:@selector(remoteServerNotFound:) withObject:nil waitUntilDone:NO];
+ }
+ [_serverCheckLock lock];
+ _checkingForServer = NO;
+ [_serverCheckLock unlock];
+ [pool release];
+}
+
+- (void)remoteServerFound:(id)sender
+{
+ if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+ [[StatusWindowController sharedController] showReconnectQueryWindow];
+ }
+}
+
+- (void)remoteServerNotFound:(id)sender
+{
+ if (![[NetworkController sharedController] isConnectedToServer]) {
+ [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
}
}
- (void)networkError:(NSException *)exception
{
ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
- NSLog(@"%@", [exception reason]);
- if ([[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);
+ 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);
+ [[StatusWindowController sharedController] showNetworkErrorQueryWindow];
if ([self disconnectFromServer]) {
[[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
- [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
+ [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
} else {
ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
}
- (void)reconnect
{
- if ([self connectToServer] == 0) {
- [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
- }
+ /*if ([self connectToServer] == 0) {
+ [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
+ }*/
+ [self checkForRemoteServerAndConnectImmediately:YES];
[[StatusWindow sharedWindow] setLocked:NO];
[[StatusWindow sharedWindow] vanish:self];
[[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
- (void)applicationLaunched:(NSNotification *)note
{
NS_DURING
- if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
+ if (!note || ([[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer])) {
ITDebugLog(@"Remote application launched.");
playerRunningState = ITMTRemotePlayerRunning;
[[self currentRemote] begin];
- (void)applicationTerminated:(NSNotification *)note
{
NS_DURING
- if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
+ if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer]) {
ITDebugLog(@"Remote application terminated.");
+ playerRunningState = ITMTRemotePlayerNotRunning;
[[self currentRemote] halt];
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
[self clearHotKeys];
- playerRunningState = ITMTRemotePlayerNotRunning;
+
+ if ([df objectForKey:@"ShowPlayer"] != nil) {
+ ITHotKey *hotKey;
+ ITDebugLog(@"Setting up show player hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"ShowPlayer"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(showPlayer)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
}
NS_HANDLER
[self networkError:localException];
[statusWindowController release];
[menuController release];
[networkController release];
+ [_serverCheckLock release];
[super dealloc];
}
-@end
\ No newline at end of file
+@end
git.ithinksw.org / MenuTunes.git / blobdiff