X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/3e983c32a1d041b4493460187d76c0bb76007b82..7a166bc12da4e76820743337d59bbbbfc1340445:/MenuTunes.m?ds=inline diff --git a/MenuTunes.m b/MenuTunes.m index bcc5590..ce98339 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -1,48 +1,66 @@ -// -// MenuTunes.m -// -// iThink Software, Copyright 2002 -// -// - /* Things to do: -¥ Radio mode makes things act oddly ¥ Make preferences window pretty -¥ Hot Keys - - hot keys can't be set when NSBGOnly is on. The window is not key, - so the KeyBroadcaster does not pick up key combos - - going to need a different way of defining key combos -¥ Optimize, this thing is big and slow :( +¥ Optimize ¥ Apple Events! Apple Events! Apple Events! - -¥ I think I found a slight memory leak: - 425 MenuTunes 7.8% 8:29.87 1 56 4827 215M+ 3.14M 135M- 599M+ +¥ Manual and webpage +¥ Finish up registration frontend */ #import "MenuTunes.h" -#import "MenuTunesView.h" #import "PreferencesController.h" #import "HotKeyCenter.h" -#import "StatusWindowController.h" + +@interface MenuTunes(Private) +- (ITMTRemote *)loadRemote; +- (void)updateMenu; +- (void)rebuildUpcomingSongsMenu; +- (void)rebuildPlaylistMenu; +- (void)rebuildEQPresetsMenu; +- (void)setupHotKeys; +- (void)timerUpdate; +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item; + +@end @implementation MenuTunes -- (void)applicationDidFinishLaunching:(NSNotification *)note +/*************************************************************************/ +#pragma mark - +#pragma mark INITIALIZATION METHODS +/*************************************************************************/ + +- (id)init { - if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) - { - [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"", @"Upcoming Songs", @"Playlists", @"", @"PreferencesÉ", @"Quit", @"", @"Current Track Info", nil] forKey:@"menu"]; + if ( ( self = [super init] ) ) { + remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; + statusWindow = [ITTransientStatusWindow sharedWindow]; } + return self; +} + +- (void)applicationDidFinishLaunching:(NSNotification *)note +{ + currentRemote = [self loadRemote]; + [currentRemote begin]; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil]; + + [self registerDefaultsIfNeeded]; menu = [[NSMenu alloc] initWithTitle:@""]; - iTunesPSN = [self iTunesPSN]; //Get PSN of iTunes if it's running - if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) + isAppRunning = [currentRemote isAppRunning]; + if (isAppRunning) { [self rebuildMenu]; - refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 -target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; + refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 + target:self + selector:@selector(timerUpdate) + userInfo:nil + repeats:YES]; } else { @@ -50,35 +68,139 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self]; [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self]; [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self]; - [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; refreshTimer = nil; } + + statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] + withLength:NSSquareStatusItemLength]; - statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength]; - [statusItem setImage:[NSImage imageNamed:@"menu.tiff"]]; - [statusItem setHighlightMode:YES]; + [statusItem setImage:[NSImage imageNamed:@"menu"]]; + [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]]; [statusItem setMenu:menu]; - [statusItem retain]; - view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]]; - //[statusItem setView:view]; + // Below line of code is for creating builds for Beta Testers + // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]]; } -- (void)applicationWillTerminate:(NSNotification *)note +- (ITMTRemote *)loadRemote { - [self clearHotKeys]; - [[NSStatusBar systemStatusBar] removeStatusItem:statusItem]; + NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath]; + + if (folderPath) { + NSArray *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath]; + NSEnumerator *enumerator = [bundlePathList objectEnumerator]; + NSString *bundlePath; + + while ( (bundlePath = [enumerator nextObject]) ) { + NSBundle* remoteBundle = [NSBundle bundleWithPath:bundlePath]; + + if (remoteBundle) { + Class remoteClass = [remoteBundle principalClass]; + + if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] && + [remoteClass isKindOfClass:[NSObject class]]) { + + id remote = [remoteClass remote]; + [remoteArray addObject:remote]; + } + } + } + +// if ( [remoteArray count] > 0 ) { +// if ( [remoteArray count] > 1 ) { +// [remoteArray sortUsingSelector:@selector(sortAlpha:)]; +// } +// [self loadModuleAccessUI]; //Comment out this line to disable remote visibility +// } + } + NSLog(@"%@", [remoteArray objectAtIndex:0]); + return [remoteArray objectAtIndex:0]; } -- (void)dealloc + +/*************************************************************************/ +#pragma mark - +#pragma mark INSTANCE METHODS +/*************************************************************************/ + +- (void)registerDefaultsIfNeeded { - if (refreshTimer) + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + if (![defaults objectForKey:@"menu"]) { + BOOL found = NO; + NSMutableDictionary *loginwindow; + NSMutableArray *loginarray; + int i; + + [defaults setObject: + [NSArray arrayWithObjects: + @"Play/Pause", + @"Next Track", + @"Previous Track", + @"Fast Forward", + @"Rewind", + @"", + @"Upcoming Songs", + @"Playlists", + @"", + @"PreferencesÉ", + @"Quit", + @"", + @"Current Track Info", + nil] forKey:@"menu"]; + + [defaults synchronize]; + loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy]; + loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; + + for (i = 0; i < [loginarray count]; i++) { + NSDictionary *tempDict = [loginarray objectAtIndex:i]; + if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { + found = YES; + } + } + + // + //This is teh sux + //We must fix it so it is no longer suxy + if (!found) { + if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) { + AEDesc scriptDesc, resultDesc; + NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]]; + ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); + + AECreateDesc(typeChar, [script cString], [script cStringLength], + &scriptDesc); + + OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); + + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); + + CloseComponent(asComponent); + } + } + } + + if (![defaults integerForKey:@"SongsInAdvance"]) { - [refreshTimer invalidate]; + [defaults setInteger:5 forKey:@"SongsInAdvance"]; + } + + if (![defaults objectForKey:@"showName"]) { + [defaults setBool:YES forKey:@"showName"]; + } + + if (![defaults objectForKey:@"showArtist"]) { + [defaults setBool:YES forKey:@"showArtist"]; + } + + if (![defaults objectForKey:@"showAlbum"]) { + [defaults setBool:NO forKey:@"showAlbum"]; + } + + if (![defaults objectForKey:@"showTime"]) { + [defaults setBool:NO forKey:@"showTime"]; } - [statusItem release]; - [menu release]; - [view release]; - [super dealloc]; } //Recreate the status item menu @@ -86,12 +208,13 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; { NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"]; int i; - trackInfoIndex = -1; - didHaveAlbumName = (([[self runScriptAndReturnResult:@"return album of current track"] length] > 0) ? YES : NO); + trackInfoIndex = -1; + lastSongIndex = -1; + didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0); + didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0); - while ([menu numberOfItems] > 0) - { + while ([menu numberOfItems] > 0) { [menu removeItemAtIndex:0]; } @@ -104,62 +227,85 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; [eqMenu release]; eqMenu = nil; - for (i = 0; i < [myMenu count]; i++) - { + for (i = 0; i < [myMenu count]; i++) { NSString *item = [myMenu objectAtIndex:i]; - if ([item isEqualToString:@"Play/Pause"]) - { - playPauseMenuItem = [menu addItemWithTitle:@"Play" action:@selector(playPause:) keyEquivalent:@""]; + if ([item isEqualToString:@"Play/Pause"]) { + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"]; + playPauseMenuItem = [menu addItemWithTitle:@"Play" + action:@selector(playPause:) + keyEquivalent:@""]; [playPauseMenuItem setTarget:self]; - } - else if ([item isEqualToString:@"Next Track"]) - { - [[menu addItemWithTitle:@"Next Track" action:@selector(nextSong:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Previous Track"]) - { - [[menu addItemWithTitle:@"Previous Track" action:@selector(prevSong:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Fast Forward"]) - { - [[menu addItemWithTitle:@"Fast Forward" action:@selector(fastForward:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Rewind"]) - { - [[menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Upcoming Songs"]) - { - upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:NULL keyEquivalent:@""]; - } - else if ([item isEqualToString:@"Playlists"]) - { - playlistItem = [menu addItemWithTitle:@"Playlists" action:NULL keyEquivalent:@""]; - } - else if ([item isEqualToString:@"EQ Presets"]) - { - eqItem = [menu addItemWithTitle:@"EQ Presets" action:NULL keyEquivalent:@""]; - } - else if ([item isEqualToString:@"PreferencesÉ"]) - { - [[menu addItemWithTitle:@"PreferencesÉ" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Quit"]) - { - [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self]; - } - else if ([item isEqualToString:@"Current Track Info"]) - { + + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem]; + [tempCombo release]; + } + } else if ([item isEqualToString:@"Next Track"]) { + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"]; + NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track" + action:@selector(nextSong:) + keyEquivalent:@""]; + + [nextTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:nextTrack]; + [tempCombo release]; + } + } else if ([item isEqualToString:@"Previous Track"]) { + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"]; + NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track" + action:@selector(prevSong:) + keyEquivalent:@""]; + + [prevTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:prevTrack]; + [tempCombo release]; + } + } else if ([item isEqualToString:@"Fast Forward"]) { + [[menu addItemWithTitle:@"Fast Forward" + action:@selector(fastForward:) + keyEquivalent:@""] setTarget:self]; + } else if ([item isEqualToString:@"Rewind"]) { + [[menu addItemWithTitle:@"Rewind" + action:@selector(rewind:) + keyEquivalent:@""] setTarget:self]; + } else if ([item isEqualToString:@"Upcoming Songs"]) { + upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" + action:nil + keyEquivalent:@""]; + } else if ([item isEqualToString:@"Playlists"]) { + playlistItem = [menu addItemWithTitle:@"Playlists" + action:nil + keyEquivalent:@""]; + } else if ([item isEqualToString:@"EQ Presets"]) { + eqItem = [menu addItemWithTitle:@"EQ Presets" + action:nil + keyEquivalent:@""]; + } else if ([item isEqualToString:@"PreferencesÉ"]) { + [[menu addItemWithTitle:@"PreferencesÉ" + action:@selector(showPreferences:) + keyEquivalent:@""] setTarget:self]; + } else if ([item isEqualToString:@"Quit"]) { + [[menu addItemWithTitle:@"Quit" + action:@selector(quitMenuTunes:) + keyEquivalent:@""] setTarget:self]; + } else if ([item isEqualToString:@"Current Track Info"]) { trackInfoIndex = [menu numberOfItems]; - [menu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""]; - } - else if ([item isEqualToString:@""]) - { + [menu addItemWithTitle:@"No Song" + action:nil + keyEquivalent:@""]; + } else if ([item isEqualToString:@""]) { [menu addItem:[NSMenuItem separatorItem]]; } } - curTrackIndex = -1; //Force update of everything [self timerUpdate]; //Updates dynamic info in the menu [self clearHotKeys]; @@ -169,142 +315,193 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; //Updates the menu with current player state, song, and upcoming songs - (void)updateMenu { - NSString *curSongName, *curAlbumName; NSMenuItem *menuItem; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) - { + if (!isAppRunning) { return; } - //Get the current track name and album. - curSongName = [self runScriptAndReturnResult:@"return name of current track"]; - curAlbumName = [self runScriptAndReturnResult:@"return album of current track"]; - - if (upcomingSongsItem) - { + if (upcomingSongsItem) { [self rebuildUpcomingSongsMenu]; } - if (playlistItem) - { + + if (playlistItem) { [self rebuildPlaylistMenu]; } - if (eqItem) - { + + if (eqItem) { [self rebuildEQPresetsMenu]; } - if ([curSongName length] > 0) + if (trackInfoIndex > -1) { - int index = [menu indexOfItemWithTitle:@"Now Playing"]; + NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; + curSongName = [currentRemote currentSongTitle]; - if (index > -1) - { - [menu removeItemAtIndex:index + 1]; - if (didHaveAlbumName) - { - [menu removeItemAtIndex:index + 1]; - } + if ([defaults boolForKey:@"showAlbum"]) { + curAlbumName = [currentRemote currentSongAlbum]; } - if ([curAlbumName length] > 0) - { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName] action:NULL keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; + if ([defaults boolForKey:@"showArtist"]) { + curArtistName = [currentRemote currentSongArtist]; } - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] action:NULL keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - - if (index == -1) - { - menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:NULL keyEquivalent:@""]; - [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]]; + if ([curSongName length] > 0) { + int index = [menu indexOfItemWithTitle:@"Now Playing"]; + if (index > -1) { + if ([defaults boolForKey:@"showName"]) { + [menu removeItemAtIndex:index + 1]; + } + if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { + [menu removeItemAtIndex:index + 1]; + } + if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { + [menu removeItemAtIndex:index + 1]; + } + if ([defaults boolForKey:@"showTime"]) { + [menu removeItemAtIndex:index + 1]; + } + } + + if (!isPlayingRadio) { + if ([defaults boolForKey:@"showTime"]) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + + if ([curArtistName length] > 0) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curArtistName] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + + if ([curAlbumName length] > 0) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + } + + if ([defaults boolForKey:@"showName"]) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + + if (index == -1) { + menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""]; + [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]]; + [menu insertItem:menuItem atIndex:trackInfoIndex]; + [menuItem release]; + } + } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) { + [menu removeItemAtIndex:trackInfoIndex]; + + if ([defaults boolForKey:@"showName"] == YES) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if ([defaults boolForKey:@"showTime"] == YES) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""]; [menu insertItem:menuItem atIndex:trackInfoIndex]; [menuItem release]; } - } - else if ([menu indexOfItemWithTitle:@"No Song"] == -1) - { - [menu removeItemAtIndex:trackInfoIndex]; - [menu removeItemAtIndex:trackInfoIndex]; - if (didHaveAlbumName) - { - [menu removeItemAtIndex:trackInfoIndex]; + + if ([defaults boolForKey:@"showArtist"]) { + didHaveArtistName = (([curArtistName length] > 0) ? YES : NO); + } + + if ([defaults boolForKey:@"showAlbum"]) { + didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); } - menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:NULL keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex]; - [menuItem release]; } - - didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); } //Rebuild the upcoming songs submenu. Can be improved a lot. - (void)rebuildUpcomingSongsMenu { - int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue]; + int curIndex = [currentRemote currentPlaylistIndex]; + int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curIndex]; int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; - if (numSongs > 0) - { - int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; - int i; - - [upcomingSongsMenu release]; - upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; - - for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) - { - if (i <= numSongs) - { - NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]]; - NSMenuItem *songItem; - songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""]; - [songItem setTarget:self]; - [songItem setEnabled:YES]; - [songItem setRepresentedObject:[NSNumber numberWithInt:i]]; - [upcomingSongsMenu addItem:songItem]; - [songItem release]; - } - else - { - [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:NULL keyEquivalent:@""]; - break; + if (!isPlayingRadio) { + if (numSongs > 0) { + int curTrack = [currentRemote currentSongIndex]; + int i; + + [upcomingSongsMenu release]; + upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; + [upcomingSongsItem setSubmenu:upcomingSongsMenu]; + [upcomingSongsItem setEnabled:YES]; + + for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { + if (i <= numSongs) { + NSString *curSong = [currentRemote songTitleAtIndex:i]; + NSMenuItem *songItem; + songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""]; + [songItem setTarget:self]; + [songItem setRepresentedObject:[NSNumber numberWithInt:i + 1]]; + [upcomingSongsMenu addItem:songItem]; + [songItem release]; + } else { + break; + } } } - [upcomingSongsItem setSubmenu:upcomingSongsMenu]; - [upcomingSongsItem setEnabled:YES]; + } else { + [upcomingSongsItem setSubmenu:nil]; + [upcomingSongsItem setEnabled:NO]; } } - (void)rebuildPlaylistMenu { - int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue]; - int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; + NSArray *playlists = [currentRemote playlists]; + int i, curPlaylist = [currentRemote currentPlaylistIndex]; - if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems])) + if (isPlayingRadio) + { + curPlaylist = 0; + } + if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems])) return; [playlistMenu release]; playlistMenu = [[NSMenu alloc] initWithTitle:@""]; - for (i = 1; i <= numPlaylists; i++) - { - NSString *playlistName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of playlist %i", i]]; + for (i = 0; i < [playlists count]; i++) { + NSString *playlistName = [playlists objectAtIndex:i]; NSMenuItem *tempItem; tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""]; [tempItem setTarget:self]; - [tempItem setRepresentedObject:[NSNumber numberWithInt:i]]; + [tempItem setRepresentedObject:[NSNumber numberWithInt:i + 1]]; [playlistMenu addItem:tempItem]; [tempItem release]; } [playlistItem setSubmenu:playlistMenu]; - if (curPlaylist) - { + if (curPlaylist) { [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState]; } } @@ -312,18 +509,17 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; //Build a menu with the list of all available EQ presets - (void)rebuildEQPresetsMenu { - int numSets = [[self runScriptAndReturnResult:@"return number of EQ presets"] intValue]; + NSArray *eqPresets = [currentRemote eqPresets]; int i; - if (eqMenu && (numSets == [eqMenu numberOfItems])) + if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems])) return; [eqMenu release]; eqMenu = [[NSMenu alloc] initWithTitle:@""]; - for (i = 1; i <= numSets; i++) - { - NSString *setName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of EQ preset %i", i]]; + for (i = 0; i < [eqPresets count]; i++) { + NSString *setName = [eqPresets objectAtIndex:i]; NSMenuItem *tempItem; tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""]; [tempItem setTarget:self]; @@ -333,7 +529,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; } [eqItem setSubmenu:eqMenu]; - [[eqMenu itemAtIndex:[[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue] - 1] setState:NSOnState]; + [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState]; } - (void)clearHotKeys @@ -349,244 +545,206 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if ([defaults objectForKey:@"PlayPause"] != nil) - { + if ([defaults objectForKey:@"PlayPause"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:[defaults keyComboForKey:@"PlayPause"] target:self action:@selector(playPause:)]; } - if ([defaults objectForKey:@"NextTrack"] != nil) - { + if ([defaults objectForKey:@"NextTrack"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:[defaults keyComboForKey:@"NextTrack"] target:self action:@selector(nextSong:)]; } - if ([defaults objectForKey:@"PrevTrack"] != nil) - { + if ([defaults objectForKey:@"PrevTrack"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:[defaults keyComboForKey:@"PrevTrack"] target:self action:@selector(prevSong:)]; } - if ([defaults objectForKey:@"TrackInfo"] != nil) - { + if ([defaults objectForKey:@"TrackInfo"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:[defaults keyComboForKey:@"TrackInfo"] target:self action:@selector(showCurrentTrackInfo)]; } - if ([defaults objectForKey:@"UpcomingSongs"] != nil) - { + if ([defaults objectForKey:@"UpcomingSongs"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:[defaults keyComboForKey:@"UpcomingSongs"] target:self action:@selector(showUpcomingSongs)]; } } -//Runs an AppleScript and returns the result as an NSString after stripping quotes, if needed. It takes in script and automatically adds the tell iTunes and end tell statements. -- (NSString *)runScriptAndReturnResult:(NSString *)script -{ - AEDesc scriptDesc, resultDesc; - Size length; - NSString *result; - Ptr buffer; - - script = [NSString stringWithFormat:@"tell application \"iTunes\"\n%@\nend tell", script]; - - AECreateDesc(typeChar, [script cString], [script cStringLength], -&scriptDesc); - - OSADoScript(OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype), &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); - - length = AEGetDescDataSize(&resultDesc); - buffer = malloc(length); - - AEGetDescData(&resultDesc, buffer, length); - AEDisposeDesc(&scriptDesc); - AEDisposeDesc(&resultDesc); - result = [NSString stringWithCString:buffer length:length]; - if (![result isEqualToString:@""] && - ([result characterAtIndex:0] == '\"') && - ([result characterAtIndex:[result length] - 1] == '\"')) - { - result = [result substringWithRange:NSMakeRange(1, [result length] - 2)]; - } - free(buffer); - buffer = NULL; - return result; -} - //Called when the timer fires. - (void)timerUpdate { - int pid; - - if (GetProcessPID(&iTunesPSN, &pid) == noErr) - { - int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; + NSLog(@"%i", [currentRemote playerState]); + if ([currentRemote playerState] != stopped) { + int trackPlayingIndex = [currentRemote currentSongIndex]; + int playlist = [currentRemote currentPlaylistIndex]; - if (trackPlayingIndex != curTrackIndex) - { + if (trackPlayingIndex != lastSongIndex) { + BOOL wasPlayingRadio = isPlayingRadio; + isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; + if (isPlayingRadio && !wasPlayingRadio) { + int i; + for (i = 0; i < [playlistMenu numberOfItems]; i++) + { + [[playlistMenu itemAtIndex:i] setState:NSOffState]; + } + } + if (wasPlayingRadio) { + NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; + [menu insertItem:temp atIndex:trackInfoIndex + 1]; + [temp release]; + } + [self updateMenu]; - curTrackIndex = trackPlayingIndex; + lastSongIndex = trackPlayingIndex; } - - //Update Play/Pause menu item - if (playPauseMenuItem) + else { - if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) - { - [playPauseMenuItem setTitle:@"Pause"]; + if (playlist != [currentRemote currentPlaylistIndex]) { + BOOL wasPlayingRadio = isPlayingRadio; + isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; + if (isPlayingRadio && !wasPlayingRadio) { + int i; + for (i = 0; i < [playlistMenu numberOfItems]; i++) + { + [[playlistMenu itemAtIndex:i] setState:NSOffState]; + } + } + if (wasPlayingRadio) { + NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; + [menu insertItem:temp atIndex:trackInfoIndex + 1]; + [temp release]; + } + [self updateMenu]; + lastSongIndex = trackPlayingIndex; } - else - { + } + //Update Play/Pause menu item + if (playPauseMenuItem){ + if ([currentRemote playerState] == playing) { + [playPauseMenuItem setTitle:@"Pause"]; + } else { [playPauseMenuItem setTitle:@"Play"]; } } } - else - { - [menu release]; - menu = [[NSMenu alloc] initWithTitle:@""]; - [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self]; - [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self]; - [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self]; - [statusItem setMenu:menu]; - - [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; - [refreshTimer invalidate]; - refreshTimer = nil; - [self clearHotKeys]; - } } - (void)iTunesLaunched:(NSNotification *)note { - NSDictionary *info = [note userInfo]; - - iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue]; - iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue]; + isAppRunning = YES; //Restart the timer refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; [self rebuildMenu]; //Rebuild the menu since no songs will be playing [statusItem setMenu:menu]; //Set the menu back to the main one - [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; -} - -//Return the PSN of iTunes, if it's running -- (ProcessSerialNumber)iTunesPSN -{ - ProcessSerialNumber procNum; - procNum.highLongOfPSN = kNoProcess; - procNum.lowLongOfPSN = 0; - - while ( (GetNextProcess(&procNum) == noErr) ) - { - CFStringRef procName; - if ( (CopyProcessName(&procNum, &procName) == noErr) ) - { - if ([(NSString *)procName isEqualToString:@"iTunes"]) - { - return procNum; - } - [(NSString *)procName release]; - } - } - return procNum; } -//Send an AppleEvent with a given event ID -- (void)sendAEWithEventClass:(AEEventClass)eventClass -andEventID:(AEEventID)eventID +- (void)iTunesTerminated:(NSNotification *)note { - OSType iTunesType = 'hook'; - AppleEvent event, reply; + isAppRunning = NO; - AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, NULL, ""); + [menu release]; + menu = [[NSMenu alloc] initWithTitle:@""]; + [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self]; + [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self]; + [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self]; + [statusItem setMenu:menu]; - AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil); - AEDisposeDesc(&event); - AEDisposeDesc(&reply); + [refreshTimer invalidate]; + refreshTimer = nil; + [self clearHotKeys]; } +// // // Selectors - called from status item menu // +// + +// Plugin dependent selectors - (void)playTrack:(id)sender { - [self runScriptAndReturnResult:[NSString stringWithFormat:@"play track %i of current playlist", [[sender representedObject] intValue]]]; + [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]]; [self updateMenu]; } - (void)selectPlaylist:(id)sender { int playlist = [[sender representedObject] intValue]; - [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]]; + if (!isPlayingRadio) { + int curPlaylist = [currentRemote currentPlaylistIndex]; + [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState]; + } + [currentRemote switchToPlaylistAtIndex:playlist]; [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; [self updateMenu]; } - (void)selectEQPreset:(id)sender { - int curSet = [[self runScriptAndReturnResult:@"return index of current EQ preset"] intValue]; + int curSet = [currentRemote currentEQPresetIndex]; int item = [[sender representedObject] intValue]; - [self runScriptAndReturnResult:[NSString stringWithFormat:@"set current EQ preset to EQ preset %i", item]]; - [self runScriptAndReturnResult:@"set EQ enabled to 1"]; + [currentRemote switchToEQAtIndex:item]; [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState]; [[eqMenu itemAtIndex:item - 1] setState:NSOnState]; } - (void)playPause:(id)sender { - NSString *state = [self runScriptAndReturnResult:@"return player state"]; - if ([state isEqualToString:@"playing"]) - { - [self sendAEWithEventClass:'hook' andEventID:'Paus']; + PlayerState state = [currentRemote playerState]; + if (state == playing) { + [currentRemote pause]; [playPauseMenuItem setTitle:@"Play"]; - } - else if ([state isEqualToString:@"fast forwarding"] || [state -isEqualToString:@"rewinding"]) - { - [self sendAEWithEventClass:'hook' andEventID:'Paus']; - [self sendAEWithEventClass:'hook' andEventID:'Play']; - } - else - { - [self sendAEWithEventClass:'hook' andEventID:'Play']; + } else if ((state == forwarding) || (state == rewinding)) { + [currentRemote pause]; + [currentRemote play]; + } else { + [currentRemote play]; [playPauseMenuItem setTitle:@"Pause"]; } } - (void)nextSong:(id)sender { - [self sendAEWithEventClass:'hook' andEventID:'Next']; + [currentRemote goToNextSong]; } - (void)prevSong:(id)sender { - [self sendAEWithEventClass:'hook' andEventID:'Prev']; + [currentRemote goToPreviousSong]; } - (void)fastForward:(id)sender { - [self sendAEWithEventClass:'hook' andEventID:'Fast']; + [currentRemote fastForward]; + [playPauseMenuItem setTitle:@"Play"]; } - (void)rewind:(id)sender { - [self sendAEWithEventClass:'hook' andEventID:'Rwnd']; + [currentRemote rewind]; + [playPauseMenuItem setTitle:@"Play"]; } +// +// +// Plugin independent selectors +// +// - (void)quitMenuTunes:(id)sender { [NSApp terminate:self]; } +//How is this going to work, now that we're pluginized? - (void)openiTunes:(id)sender { [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"]; @@ -594,8 +752,7 @@ isEqualToString:@"rewinding"]) - (void)showPreferences:(id)sender { - if (!prefsController) - { + if (!prefsController) { prefsController = [[PreferencesController alloc] initWithMenuTunes:self]; [self clearHotKeys]; } @@ -604,8 +761,7 @@ isEqualToString:@"rewinding"]) - (void)closePreferences { - if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) - { + if (isAppRunning) { [self setupHotKeys]; } [prefsController release]; @@ -620,105 +776,297 @@ isEqualToString:@"rewinding"]) - (void)showCurrentTrackInfo { - NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"]; - if (!statusController && [trackName length]) - { + NSString *trackName = [currentRemote currentSongTitle]; + if (!statusWindow && [trackName length]) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *stringToShow = @""; - int lines = 1; - if ([defaults boolForKey:@"showName"]) - { - if ([defaults boolForKey:@"showArtist"]) - { - NSString *trackArtist = [self runScriptAndReturnResult:@"return artist of current track"]; + if ([defaults boolForKey:@"showName"]) { + if ([defaults boolForKey:@"showArtist"]) { + NSString *trackArtist = [currentRemote currentSongArtist]; trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName]; } stringToShow = [stringToShow stringByAppendingString:trackName]; stringToShow = [stringToShow stringByAppendingString:@"\n"]; - if ([trackName length] > 38) - { - lines++; - } - lines++; } - if ([defaults boolForKey:@"showAlbum"]) - { - NSString *trackAlbum = [self runScriptAndReturnResult:@"return album of current track"]; - if ([trackAlbum length]) - { + if ([defaults boolForKey:@"showAlbum"]) { + NSString *trackAlbum = [currentRemote currentSongAlbum]; + if ([trackAlbum length]) { stringToShow = [stringToShow stringByAppendingString:trackAlbum]; stringToShow = [stringToShow stringByAppendingString:@"\n"]; - lines++; } } - if ([defaults boolForKey:@"showTime"]) - { - NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"]; - if ([trackTime length]) - { + if ([defaults boolForKey:@"showTime"]) { + NSString *trackTime = [currentRemote currentSongLength]; + if ([trackTime length]) { stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime]; - lines++; } } { - int trackTimeLeft = [[self runScriptAndReturnResult:@"return (duration of current track) - player position"] intValue]; + int trackTimeLeft = [[currentRemote currentSongRemaining] intValue]; int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60; - if (seconds < 10) - { + if (seconds < 10) { stringToShow = [stringToShow stringByAppendingString: [NSString stringWithFormat:@"Time Remaining: %i:0%i", minutes, seconds]]; - } - else - { + } else { stringToShow = [stringToShow stringByAppendingString: [NSString stringWithFormat:@"Time Remaining: %i:%i", minutes, seconds]]; } } - statusController = [[StatusWindowController alloc] init]; - [statusController setTrackInfo:stringToShow lines:lines]; - [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO]; + [statusWindow setTrackInfo:stringToShow]; + [NSTimer scheduledTimerWithTimeInterval:3.0 + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } - (void)showUpcomingSongs { - if (!statusController) - { - int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue]; + int curPlaylist = [currentRemote currentPlaylistIndex]; + if (!statusWindow) { + int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist]; - if (numSongs > 0) - { + if (numSongs > 0) { int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; - int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; + int curTrack = [currentRemote currentSongIndex]; int i; NSString *songs = @""; - statusController = [[StatusWindowController alloc] init]; - for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) - { - if (i <= numSongs) - { - NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]]; + statusWindow = [ITTransientStatusWindow sharedWindow]; + for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { + if (i <= numSongs) { + NSString *curSong = [currentRemote songTitleAtIndex:i]; songs = [songs stringByAppendingString:curSong]; songs = [songs stringByAppendingString:@"\n"]; } } - [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance]; - [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO]; + [statusWindow setUpcomingSongs:songs]; + [NSTimer scheduledTimerWithTimeInterval:3.0 + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } } - (void)fadeAndCloseStatusWindow { - [statusController fadeWindowOut]; - [statusController release]; - statusController = nil; + [statusWindow orderOut:self]; } -@end +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item +{ + unichar charcode = 'a'; + int i; + long cocoaModifiers = 0; + static long carbonToCocoa[6][2] = + { + { cmdKey, NSCommandKeyMask }, + { optionKey, NSAlternateKeyMask }, + { controlKey, NSControlKeyMask }, + { shiftKey, NSShiftKeyMask }, + }; + + for (i = 0; i < 6; i++) + { + if (modifiers & carbonToCocoa[i][0]) + { + cocoaModifiers += carbonToCocoa[i][1]; + } + } + [item setKeyEquivalentModifierMask:cocoaModifiers]; + + //Missing key combos for some keys. Must find them later. + switch (code) + { + case 36: + charcode = '\r'; + break; + + case 48: + charcode = '\t'; + break; + + //Space -- ARGH! + case 49: + { + /*MenuRef menuRef = _NSGetCarbonMenu([item menu]); + NSLog(@"%@", menuRef); + SetMenuItemCommandKey(menuRef, 0, NO, 49); + SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier); + SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph); + charcode = 'b';*/ + } + break; + + case 51: + charcode = NSDeleteFunctionKey; + break; + + case 53: + charcode = '\e'; + break; + + case 71: + charcode = '\e'; + break; + + case 76: + charcode = '\r'; + break; + + case 96: + charcode = NSF5FunctionKey; + break; + + case 97: + charcode = NSF6FunctionKey; + break; + + case 98: + charcode = NSF7FunctionKey; + break; + + case 99: + charcode = NSF3FunctionKey; + break; + + case 100: + charcode = NSF8FunctionKey; + break; + + case 101: + charcode = NSF9FunctionKey; + break; + + case 103: + charcode = NSF11FunctionKey; + break; + + case 105: + charcode = NSF3FunctionKey; + break; + + case 107: + charcode = NSF14FunctionKey; + break; + + case 109: + charcode = NSF10FunctionKey; + break; + + case 111: + charcode = NSF12FunctionKey; + break; + + case 113: + charcode = NSF13FunctionKey; + break; + + case 114: + charcode = NSInsertFunctionKey; + break; + + case 115: + charcode = NSHomeFunctionKey; + break; + + case 116: + charcode = NSPageUpFunctionKey; + break; + + case 117: + charcode = NSDeleteFunctionKey; + break; + + case 118: + charcode = NSF4FunctionKey; + break; + + case 119: + charcode = NSEndFunctionKey; + break; + + case 120: + charcode = NSF2FunctionKey; + break; + + case 121: + charcode = NSPageDownFunctionKey; + break; + + case 122: + charcode = NSF1FunctionKey; + break; + + case 123: + charcode = NSLeftArrowFunctionKey; + break; + + case 124: + charcode = NSRightArrowFunctionKey; + break; + + case 125: + charcode = NSDownArrowFunctionKey; + break; + + case 126: + charcode = NSUpArrowFunctionKey; + break; + } + + if (charcode == 'a') { + unsigned long state; + long keyTrans; + char charCode; + Ptr kchr; + state = 0; + kchr = (Ptr) GetScriptVariable(smCurrentScript, smKCHRCache); + keyTrans = KeyTranslate(kchr, code, &state); + charCode = keyTrans; + [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]]; + } else if (charcode != 'b') { + [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]]; + } +} + +/*************************************************************************/ +#pragma mark - +#pragma mark NSApplication DELEGATE METHODS +/*************************************************************************/ + +- (void)applicationWillTerminate:(NSNotification *)note +{ + [self clearHotKeys]; + [[NSStatusBar systemStatusBar] removeStatusItem:statusItem]; +} + + +/*************************************************************************/ +#pragma mark - +#pragma mark DEALLOCATION METHODS +/*************************************************************************/ + +- (void)dealloc +{ + if (refreshTimer) { + [refreshTimer invalidate]; + refreshTimer = nil; + } + [currentRemote halt]; + [statusItem release]; + [menu release]; +// [view release]; + [super dealloc]; +} + +@end \ No newline at end of file