#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 NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
+@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
if ([df boolForKey:@"enableSharing"]) {
[self setServerStatus:YES];
} else if ([df boolForKey:@"useSharedPlayer"]) {
- [self checkForRemoteServer:nil];
- /*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
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];
- (void)timerUpdate
{
- if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
- ITDebugLog(@"The song changed.");
-
+ if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
+ if ([statusItem isEnabled]) {
+ [statusItem setToolTip:@"iTunes not responding."];
+ [self clearHotKeys];
+ }
+ [statusItem setEnabled:NO];
+ return;
+ } else if (![statusItem isEnabled]) {
+ [statusItem setEnabled:YES];
+ [statusItem setToolTip:_toolTip];
+ [self setupHotKeys];
+ return;
+ }
+
+ if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
+ 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];
if ( [df boolForKey:@"showToolTip"] ) {
NSString *artist = [[self currentRemote] currentSongArtist];
NSString *title = [[self currentRemote] currentSongTitle];
- NSString *toolTip;
ITDebugLog(@"Creating status item tooltip.");
if (artist) {
- toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+ _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
} else if (title) {
- toolTip = title;
+ _toolTip = title;
} else {
- toolTip = @"No Song Playing";
+ _toolTip = @"No Song Playing";
}
- [statusItem setToolTip:toolTip];
+ [statusItem setToolTip:_toolTip];
} else {
[statusItem setToolTip:nil];
}
- (void)menuClicked
{
ITDebugLog(@"Menu clicked.");
+
+ if ( ([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning ) {
+ if ([statusItem isEnabled]) {
+ [statusItem setToolTip:@"iTunes not responding."];
+ [self clearHotKeys];
+ }
+ [statusItem setEnabled:NO];
+ return;
+ } else if (![statusItem isEnabled]) {
+ [statusItem setEnabled:YES];
+ [statusItem setToolTip:_toolTip];
+ [self setupHotKeys];
+ return;
+ }
+
if ([networkController isConnectedToServer]) {
//Used the cached version
return;
{
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.");
[[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 *track = nil;
NSImage *art = nil;
int rating = -1;
+ int playCount = -1;
ITDebugLog(@"Showing track info status window.");
NS_ENDHANDLER
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];
if ( [df boolForKey:@"showTime"] ) {
NS_DURING
time = [NSString stringWithFormat:@"%@: %@ / %@",
- @"Time",
+ NSLocalizedString(@"time", @"Time"),
[[self currentRemote] currentSongElapsed],
[[self currentRemote] currentSongLength]];
NS_HANDLER
}
}
- 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];
+ 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.");
}
time:time
track:track
rating:rating
+ playCount:playCount
image:art];
}
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
return YES;
}
-- (void)checkForRemoteServer:(NSTimer *)timer
+- (void)checkForRemoteServer
+{
+ [self checkForRemoteServerAndConnectImmediately:NO];
+}
+
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately
{
ITDebugLog(@"Checking for remote server.");
-
- //New code
- [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:nil];
- //[timer invalidate];
- //
-
- /*if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
- ITDebugLog(@"Remote server found.");
- [timer invalidate];
- if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
- [[StatusWindowController sharedController] showReconnectQueryWindow];
+ if (!_checkingForServer) {
+ if (!_serverCheckLock) {
+ _serverCheckLock = [[NSLock alloc] init];
}
- } else {
- ITDebugLog(@"Remote server not found.");
- }*/
+ [_serverCheckLock lock];
+ _checkingForServer = YES;
+ [_serverCheckLock unlock];
+ [NSThread detachNewThreadSelector:@selector(runRemoteServerCheck:) toTarget:self withObject:[NSNumber numberWithBool:connectImmediately]];
+ }
}
- (void)runRemoteServerCheck:(id)sender
ITDebugLog(@"Remote server check running.");
if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
ITDebugLog(@"Remote server found.");
- [self performSelectorOnMainThread:@selector(remoteServerFound:) withObject:nil waitUntilDone:NO];
+ 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)remoteServerNotFound:(id)sender
{
- [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:NO];
+ 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]);
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);
+ //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];
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
+ [statusItem setEnabled:YES];
+ [statusItem setToolTip:@"iTunes not running."];
[self clearHotKeys];
if ([df objectForKey:@"ShowPlayer"] != nil) {
[statusWindowController release];
[menuController release];
[networkController release];
+ [_serverCheckLock release];
[super dealloc];
}
git.ithinksw.org / MenuTunes.git / blobdiff