-/*
-Things to do:
-¥ Make preferences window pretty
-¥ Optimize
-¥ Apple Events! Apple Events! Apple Events!
-*/
-
#import "MenuTunes.h"
-// #import "MenuTunesView.h"
#import "PreferencesController.h"
#import "HotKeyCenter.h"
-#import "StatusWindowController.h"
+#import "StatusWindow.h"
@interface MenuTunes(Private)
-- (void)registerDefaultsIfNeeded;
+- (ITMTRemote *)loadRemote;
- (void)updateMenu;
- (void)rebuildUpcomingSongsMenu;
- (void)rebuildPlaylistMenu;
- (void)rebuildEQPresetsMenu;
- (void)setupHotKeys;
-- (NSString *)runScriptAndReturnResult:(NSString *)script;
- (void)timerUpdate;
-- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+ onItem:(NSMenuItem *)item;
@end
#pragma mark INITIALIZATION METHODS
/*************************************************************************/
-- (void)applicationDidFinishLaunching:(NSNotification *)note
+- (id)init
{
- asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
+ if ( ( self = [super init] ) ) {
+ remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+ statusWindow = [StatusWindow sharedWindow];
+ }
+ return self;
+}
+- (void)applicationDidFinishLaunching:(NSNotification *)note
+{
+ currentRemote = [self loadRemote];
+ [currentRemote begin];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerLaunched:) 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)))
- {
- [self rebuildMenu];
- refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
- target:self
- selector:@selector(timerUpdate)
- userInfo:nil
- repeats:YES];
- }
- else
- {
- 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];
- [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
- refreshTimer = nil;
+ if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
+ [self remotePlayerLaunched:nil];
+ } else {
+ [self remotePlayerTerminated:nil];
}
- statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
- [[[statusItem _button] cell] setType:NSNullCellType];
+ statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength];
+
[statusItem setImage:[NSImage imageNamed:@"menu"]];
- [[statusItem _button] setAlternateImage:[NSImage imageNamed:@"selected_image"]];
- [statusItem setHighlightMode:YES];
+ [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
[statusItem setMenu:menu];
// Below line of code is for creating builds for Beta Testers
- // [statusItem setToolTip:@"This Nontransferable Beta (Built on __DATE__) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com)."];
- [statusItem retain];
-// view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]];
-// [statusItem setView:view];
+ // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
+}
+
+- (ITMTRemote *)loadRemote
+{
+ 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 ) { // UNCOMMENT WHEN WE HAVE > 1 PLUGIN
+// if ( [remoteArray count] > 1 ) {
+// [remoteArray sortUsingSelector:@selector(sortAlpha:)];
+// }
+// [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
+// }
+ }
+// NSLog(@"%@", [remoteArray objectAtIndex:0]); //DEBUG
+ return [remoteArray objectAtIndex:0];
}
- (void)registerDefaultsIfNeeded
{
- if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) {
- [[NSUserDefaults standardUserDefaults] setObject:
+ 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",
@"<separator>",
@"Upcoming Songs",
@"Playlists",
+ @"Song Rating",
@"<separator>",
@"PreferencesÉ",
@"Quit",
@"<separator>",
@"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"])
+ {
+ [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"];
}
}
int i;
trackInfoIndex = -1;
- didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
-
+ lastSongIndex = -1;
+ lastPlaylistIndex = -1;
+ didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
+ didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
+
while ([menu numberOfItems] > 0) {
[menu removeItemAtIndex:0];
}
playPauseMenuItem = nil;
upcomingSongsItem = nil;
+ songRatingMenuItem = nil;
playlistItem = nil;
[playlistMenu release];
playlistMenu = nil;
for (i = 0; i < [myMenu count]; i++) {
NSString *item = [myMenu objectAtIndex:i];
if ([item isEqualToString:@"Play/Pause"]) {
+ KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];
playPauseMenuItem = [menu addItemWithTitle:@"Play"
- action:@selector(playPause:)
- keyEquivalent:@""];
+ action:@selector(playPause:)
+ keyEquivalent:@""];
[playPauseMenuItem setTarget:self];
+
+ if (tempCombo) {
+ [self setKeyEquivalentForCode:[tempCombo keyCode]
+ andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
+ [tempCombo release];
+ }
} else if ([item isEqualToString:@"Next Track"]) {
- [[menu addItemWithTitle:@"Next Track"
- action:@selector(nextSong:)
- keyEquivalent:@""] setTarget:self];
+ 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"]) {
- [[menu addItemWithTitle:@"Previous Track"
- action:@selector(prevSong:)
- keyEquivalent:@""] setTarget:self];
+ 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];
+ action:@selector(fastForward:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Rewind"]) {
[[menu addItemWithTitle:@"Rewind"
- action:@selector(rewind:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(rewind:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Upcoming Songs"]) {
upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"Playlists"]) {
playlistItem = [menu addItemWithTitle:@"Playlists"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"EQ Presets"]) {
eqItem = [menu addItemWithTitle:@"EQ Presets"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"PreferencesÉ"]) {
[[menu addItemWithTitle:@"PreferencesÉ"
- action:@selector(showPreferences:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(showPreferences:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Quit"]) {
[[menu addItemWithTitle:@"Quit"
- action:@selector(quitMenuTunes:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(quitMenuTunes:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Current Track Info"]) {
trackInfoIndex = [menu numberOfItems];
[menu addItemWithTitle:@"No Song"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
+ } else if ([item isEqualToString:@"Song Rating"]) {
+ NSMenuItem *item;
+ int i;
+ NSString *curTitle = @".....";
+
+ songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"
+ action:nil
+ keyEquivalent:@""];
+
+ ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+
+ item = [ratingMenu addItemWithTitle:@"....."
+ action:@selector(setSongRating:)
+ keyEquivalent:@""];
+ [item setTarget:self];
+ [item setTag:0];
+
+ for (i = 1; i < 6; i++) {
+ curTitle = [curTitle substringToIndex:4];
+ curTitle = [@"x" stringByAppendingString:curTitle];
+ item = [ratingMenu addItemWithTitle:curTitle
+ action:@selector(setSongRating:)
+ keyEquivalent:@""];
+ [item setTarget:self];
+ [item setTag:(i * 20)];
+ }
} else if ([item isEqualToString:@"<separator>"]) {
[menu addItem:[NSMenuItem separatorItem]];
}
}
- curTrackIndex = -1; //Force update of everything
[self timerUpdate]; //Updates dynamic info in the menu
[self clearHotKeys];
//Updates the menu with current player state, song, and upcoming songs
- (void)updateMenu
{
- NSString *curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
NSMenuItem *menuItem;
- if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+ if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {
return;
}
if (upcomingSongsItem) {
[self rebuildUpcomingSongsMenu];
}
+
if (playlistItem) {
[self rebuildPlaylistMenu];
}
+
if (eqItem) {
[self rebuildEQPresetsMenu];
}
-
- if (trackInfoIndex > -1)
- {
- NSString *curSongName;
- curSongName = [self runScriptAndReturnResult:@"return name of current track"];
+ if (trackInfoIndex > -1) {
+ NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
+ curSongName = [currentRemote currentSongTitle];
+
+ if ([defaults boolForKey:@"showAlbum"]) {
+ curAlbumName = [currentRemote currentSongAlbum];
+ }
+
+ if ([defaults boolForKey:@"showArtist"]) {
+ curArtistName = [currentRemote currentSongArtist];
+ }
+
if ([curSongName length] > 0) {
int index = [menu indexOfItemWithTitle:@"Now Playing"];
-
if (index > -1) {
- [menu removeItemAtIndex:index + 1];
- if (didHaveAlbumName) {
+ 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:@""];
+ action:nil
+ keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
[menuItem release];
}
+
+ if (songRatingMenuItem) {
+ int rating = (int)[currentRemote currentSongRating] * 10;
+ int i;
+ for (i = 0; i < 5; i++) {
+ [[ratingMenu itemAtIndex:i] setState:NSOffState];
+ [[ratingMenu itemAtIndex:i] setTarget:self];
+ }
+ [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState];
+ }
+ }
+
+ if ([defaults boolForKey:@"showName"]) {
+ menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName]
+ action:nil
+ keyEquivalent:@""];
+ [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
+ [menuItem release];
}
- 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];
+
+ [songRatingMenuItem setSubmenu:ratingMenu];
+ [songRatingMenuItem setEnabled:YES];
}
-
} else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
[menu removeItemAtIndex:trackInfoIndex];
- [menu removeItemAtIndex:trackInfoIndex];
- if (didHaveAlbumName) {
+ 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];
}
[menu insertItem:menuItem atIndex:trackInfoIndex];
[menuItem release];
}
+
+ if ([defaults boolForKey:@"showArtist"]) {
+ didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);
+ }
+
+ if ([defaults boolForKey:@"showAlbum"]) {
+ didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
+ }
}
- didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
+ [menu update];
}
//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 (!isPlayingRadio) {
if (numSongs > 0) {
- int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
+ int curTrack = [currentRemote currentSongIndex];
int i;
[upcomingSongsMenu release];
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]];
+ NSString *curSong = [currentRemote songTitleAtIndex:i];
NSMenuItem *songItem;
songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
[songItem setTarget:self];
- (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 (isPlayingRadio)
- {
+ if (isPlayingRadio) {
curPlaylist = 0;
}
-
- if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems]))
+ 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];
+ [playlistItem setEnabled:YES];
if (curPlaylist) {
[[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
//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];
+ NSMenuItem *enabledItem;
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]];
+ enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+ action:@selector(toggleEqualizer)
+ keyEquivalent:@""];
+
+ if ([currentRemote equalizerEnabled] == NO) {
+ [enabledItem setState:NSOnState];
+ }
+
+ [eqMenu addItem:[NSMenuItem separatorItem]];
+
+ for (i = 0; i < [eqPresets count]; i++) {
+ NSString *setName = [eqPresets objectAtIndex:i];
NSMenuItem *tempItem;
+ if (setName) {
tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
[tempItem setTarget:self];
[tempItem setRepresentedObject:[NSNumber numberWithInt:i]];
[eqMenu addItem:tempItem];
[tempItem release];
+ }
}
[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
}
}
-//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(asComponent, &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 = nil;
- 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];
+ int playlist = [currentRemote currentPlaylistIndex];
+ ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
+
+ if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {
+ int trackPlayingIndex = [currentRemote currentSongIndex];
- if (trackPlayingIndex != curTrackIndex) {
- bool wasPlayingRadio = isPlayingRadio;
- isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+ if (trackPlayingIndex != lastSongIndex) {
+ BOOL wasPlayingRadio = isPlayingRadio;
+ isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+
if (isPlayingRadio && !wasPlayingRadio) {
int i;
for (i = 0; i < [playlistMenu numberOfItems]; i++)
{
[[playlistMenu itemAtIndex:i] setState:NSOffState];
}
+ } else {
+ [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
}
+
if (wasPlayingRadio) {
NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
[menu insertItem:temp atIndex:trackInfoIndex + 1];
[temp release];
}
+
[self updateMenu];
- curTrackIndex = trackPlayingIndex;
- }
- else
- {
- int playlist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
- if (playlist != curPlaylistIndex) {
- bool wasPlayingRadio = isPlayingRadio;
- isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"];
+ lastSongIndex = trackPlayingIndex;
+ } else {
+ if (playlist != lastPlaylistIndex) {
+ BOOL wasPlayingRadio = isPlayingRadio;
+ isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+
if (isPlayingRadio && !wasPlayingRadio) {
int i;
- for (i = 0; i < [playlistMenu numberOfItems]; 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];
}
+
+ if (!isPlayingRadio) {
+ int i;
+ for (i = 0; i < [playlistMenu numberOfItems]; i++)
+ {
+ [[playlistMenu itemAtIndex:i] setState:NSOffState];
+ }
+ [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
+ }
+
[self updateMenu];
- curTrackIndex = trackPlayingIndex;
- curPlaylistIndex = playlist;
+ lastSongIndex = trackPlayingIndex;
+ lastPlaylistIndex = playlist;
}
}
//Update Play/Pause menu item
if (playPauseMenuItem){
- if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
+ if (playerPlayingState == ITMTRemotePlayerPlaying) {
[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];
+ } else if ((lastPlaylistIndex > 0) && (playlist == 0)) {
+ NSMenuItem *menuItem;
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ //Remote the now playing item and add no song item
+ [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];
+ }
+
+ [playPauseMenuItem setTitle:@"Play"];
+
+ didHaveArtistName = NO;
+ didHaveAlbumName = NO;
+ lastPlaylistIndex = -1;
+ lastSongIndex = -1;
+
+ [upcomingSongsItem setSubmenu:nil];
+ [upcomingSongsItem setEnabled:NO];
+
+ [songRatingMenuItem setSubmenu:nil];
+ [songRatingMenuItem setEnabled:NO];
+
+ menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
+ [menu insertItem:menuItem atIndex:trackInfoIndex];
+ [menuItem release];
}
}
-- (void)iTunesLaunched:(NSNotification *)note
+- (void)remotePlayerLaunched:(NSNotification *)note
{
- NSDictionary *info = [note userInfo];
-
- iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
- iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
+ isAppRunning = ITMTRemotePlayerRunning;
//Restart the timer
- refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
+ [NSThread detachNewThreadSelector:@selector(runTimerInNewThread) toTarget:self withObject:nil];
[self rebuildMenu]; //Rebuild the menu since no songs will be playing
+ if (playlistItem) {
+ [self rebuildPlaylistMenu];
+ }
+ if (eqItem) {
+ [self rebuildEQPresetsMenu];
+ }
[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
+- (void)runTimerInNewThread
{
- 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;
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+ refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+ [runLoop run];
+ [pool release];
}
-//Send an AppleEvent with a given event ID
-- (void)sendAEWithEventClass:(AEEventClass)eventClass
-andEventID:(AEEventID)eventID
+- (void)remotePlayerTerminated:(NSNotification *)note
{
- OSType iTunesType = 'hook';
- AppleEvent event, reply;
+ isAppRunning = ITMTRemotePlayerNotRunning;
- AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
+ [menu release];
+ menu = [[NSMenu alloc] initWithTitle:@""];
+ [menu addItemWithTitle:@"Audio Player" action:NULL keyEquivalent:@""];
+ [menu addItemWithTitle:@"Not Running" action:NULL keyEquivalent:@""];
+ [menu addItem:[NSMenuItem separatorItem]];
+ [[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 release];
+ 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]]];
- [self updateMenu];
+ [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
}
- (void)selectPlaylist:(id)sender
{
int playlist = [[sender representedObject] intValue];
if (!isPlayingRadio) {
- int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
- [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+ int curPlaylist = [currentRemote currentPlaylistIndex];
+ if (curPlaylist > 0) {
+ [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+ }
}
- [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
+ [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"];
- [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
- [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+ [currentRemote switchToEQAtIndex:item];
+ [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
+ [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
}
- (void)playPause:(id)sender
{
- NSString *state = [self runScriptAndReturnResult:@"return player state"];
- if ([state isEqualToString:@"playing"]) {
- [self sendAEWithEventClass:'hook' andEventID:'Paus'];
+ ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
+
+ if (state == ITMTRemotePlayerPlaying) {
+ [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 if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
+ [currentRemote pause];
+ [currentRemote play];
} else {
- [self sendAEWithEventClass:'hook' andEventID:'Play'];
+ [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 forward];
+ [playPauseMenuItem setTitle:@"Play"];
}
- (void)rewind:(id)sender
{
- [self sendAEWithEventClass:'hook' andEventID:'Rwnd'];
+ [currentRemote rewind];
+ [playPauseMenuItem setTitle:@"Play"];
}
-- (void)quitMenuTunes:(id)sender
+- (void)toggleEqualizer
{
- [NSApp terminate:self];
+ [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (void)setSongRating:(id)sender
+{
+ NSLog(@"%f", [currentRemote currentSongRating]);
+ NSLog(@"%f", (float)[sender tag] / 100.0);
+ [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
}
-- (void)openiTunes:(id)sender
+//
+//
+// Plugin independent selectors
+//
+//
+- (void)quitMenuTunes:(id)sender
{
- [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];
+ [NSApp terminate:self];
}
- (void)showPreferences:(id)sender
}
}
-
- (void)closePreferences
{
- if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) {
+ if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
[self setupHotKeys];
}
[prefsController release];
- (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"];
+ 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"];
+ 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"];
+ 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) {
stringToShow = [stringToShow stringByAppendingString:
}
}
- statusController = [[StatusWindowController alloc] init];
- [statusController setTrackInfo:stringToShow lines:lines];
+ [statusWindow setText:stringToShow];
[NSTimer scheduledTimerWithTimeInterval:3.0
- target:self
- selector:@selector(fadeAndCloseStatusWindow)
- userInfo:nil
- repeats:NO];
+ 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) {
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];
+ statusWindow = [ITTransientStatusWindow sharedWindow];
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]];
+ NSString *curSong = [currentRemote songTitleAtIndex:i];
songs = [songs stringByAppendingString:curSong];
songs = [songs stringByAppendingString:@"\n"];
}
}
- [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance];
+ [statusWindow setText:songs];
[NSTimer scheduledTimerWithTimeInterval:3.0
- target:self
- selector:@selector(fadeAndCloseStatusWindow)
- userInfo:nil
- repeats:NO];
+ target:self
+ selector:@selector(fadeAndCloseStatusWindow)
+ userInfo:nil
+ repeats:NO];
}
}
}
- (void)fadeAndCloseStatusWindow
{
- [statusController fadeWindowOut];
- [statusController release];
- statusController = nil;
+ [statusWindow orderOut:self];
+}
+
+- (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]];
+ }
}
/*************************************************************************/
{
if (refreshTimer) {
[refreshTimer invalidate];
+ [refreshTimer release];
refreshTimer = nil;
}
- CloseComponent(asComponent);
+ [currentRemote halt];
[statusItem release];
[menu release];
// [view release];
[super dealloc];
}
-
@end
git.ithinksw.org / MenuTunes.git / blobdiff