X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/f6263bd81b387e4d015c5f7f47d09e6e0f5dae07..e740c3a87c5e9bcf4ef1751b37545fc616592e6c:/MenuTunes.m diff --git a/MenuTunes.m b/MenuTunes.m index 36649dc..31509a1 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -4,6 +4,7 @@ Things to do: ¥ Optimize ¥ Apple Events! Apple Events! Apple Events! ¥ Manual and webpage +¥ Finish up registration frontend */ #import "MenuTunes.h" @@ -12,6 +13,7 @@ Things to do: #import "StatusWindowController.h" @interface MenuTunes(Private) +- (ITMTRemote *)loadRemote; - (void)updateMenu; - (void)rebuildUpcomingSongsMenu; - (void)rebuildPlaylistMenu; @@ -20,6 +22,8 @@ Things to do: - (NSString *)runScriptAndReturnResult:(NSString *)script; - (void)timerUpdate; - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID; +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item; @end @@ -30,8 +34,19 @@ Things to do: #pragma mark INITIALIZATION METHODS /*************************************************************************/ +- (id)init +{ + if ( ( self = [super init] ) ) { + remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; + } + return self; +} + - (void)applicationDidFinishLaunching:(NSNotification *)note { + currentRemote = [self loadRemote]; + [currentRemote begin]; + asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); [self registerDefaultsIfNeeded]; @@ -43,10 +58,12 @@ Things to do: { [self rebuildMenu]; refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 - target:self - selector:@selector(timerUpdate) - userInfo:nil - repeats:YES]; + target:self + selector:@selector(timerUpdate) + userInfo:nil + repeats:YES]; + + [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil]; } else { @@ -68,6 +85,41 @@ Things to do: // [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 ) { +// 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]; +} + /*************************************************************************/ #pragma mark - @@ -156,6 +208,7 @@ Things to do: int i; trackInfoIndex = -1; + lastSongIndex = -1; didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0); didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0); @@ -176,18 +229,44 @@ Things to do: 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:) @@ -226,7 +305,6 @@ Things to do: } } - curTrackIndex = -1; //Force update of everything [self timerUpdate]; //Updates dynamic info in the menu [self clearHotKeys]; @@ -258,14 +336,14 @@ Things to do: if (trackInfoIndex > -1) { NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; - curSongName = [self runScriptAndReturnResult:@"return name of current track"]; + curSongName = [currentRemote currentSongTitle]; if ([defaults boolForKey:@"showAlbum"]) { - curAlbumName = [self runScriptAndReturnResult:@"return album of current track"]; + curAlbumName = [currentRemote currentSongAlbum]; } if ([defaults boolForKey:@"showArtist"]) { - curArtistName = [self runScriptAndReturnResult:@"return artist of current track"]; + curArtistName = [currentRemote currentSongArtist]; } if ([curSongName length] > 0) { @@ -274,16 +352,17 @@ Things to do: if ([defaults boolForKey:@"showName"]) { [menu removeItemAtIndex:index + 1]; } - if (didHaveAlbumName) { + if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { [menu removeItemAtIndex:index + 1]; } - if (didHaveArtistName) { + 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:@" %@", [self runScriptAndReturnResult:@"return time of current track"]] @@ -349,11 +428,11 @@ Things to do: } if ([defaults boolForKey:@"showArtist"]) { - didHaveAlbumName = (([curArtistName length] > 0) ? YES : NO); + didHaveArtistName = (([curArtistName length] > 0) ? YES : NO); } if ([defaults boolForKey:@"showAlbum"]) { - didHaveArtistName = (([curAlbumName length] > 0) ? YES : NO); + didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); } } } @@ -361,11 +440,12 @@ Things to do: //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]; @@ -375,7 +455,7 @@ Things to do: 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]; @@ -395,22 +475,22 @@ Things to do: - (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) { 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 = 1; i < [playlists count]; i++) { + NSString *playlistName = [playlists objectAtIndex:i]; NSMenuItem *tempItem; tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""]; [tempItem setTarget:self]; @@ -428,17 +508,17 @@ Things to do: //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]; @@ -448,7 +528,7 @@ Things to do: } [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 @@ -530,13 +610,32 @@ Things to do: //Called when the timer fires. - (void)timerUpdate { - int pid; - if (GetProcessPID(&iTunesPSN, &pid) == noErr) { - int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; - - if (trackPlayingIndex != curTrackIndex) { + int trackPlayingIndex = [currentRemote currentSongIndex]; + int playlist = [currentRemote currentPlaylistIndex]; + + 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]; + lastSongIndex = trackPlayingIndex; + } + else + { + if (playlist != [currentRemote currentPlaylistIndex]) { bool wasPlayingRadio = isPlayingRadio; - isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"]; + isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; if (isPlayingRadio && !wasPlayingRadio) { int i; for (i = 0; i < [playlistMenu numberOfItems]; i++) @@ -550,51 +649,16 @@ Things to do: [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"]; - 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; - curPlaylistIndex = playlist; - } + lastSongIndex = trackPlayingIndex; } - //Update Play/Pause menu item - if (playPauseMenuItem){ - if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) { - [playPauseMenuItem setTitle:@"Pause"]; - } else { - [playPauseMenuItem setTitle:@"Play"]; - } + } + //Update Play/Pause menu item + if (playPauseMenuItem){ + if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"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]; } } @@ -611,25 +675,47 @@ Things to do: [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]; + + [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil]; +} + +- (void)iTunesTerminated:(NSNotification *)note +{ + [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; + + [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]; } //Return the PSN of iTunes, if it's running - (ProcessSerialNumber)iTunesPSN { - ProcessSerialNumber procNum; - procNum.highLongOfPSN = kNoProcess; - procNum.lowLongOfPSN = 0; + NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications]; + ProcessSerialNumber number; + int i; - while ( (GetNextProcess(&procNum) == noErr) ) { - CFStringRef procName; - if ( (CopyProcessName(&procNum, &procName) == noErr) ) { - if ([(NSString *)procName isEqualToString:@"iTunes"]) { - return procNum; - } - CFRelease(release); + number.highLongOfPSN = kNoProcess; + + for (i = 0; i < [apps count]; i++) + { + NSDictionary *curApp = [apps objectAtIndex:i]; + + if ([[curApp objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) + { + number.highLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberHigh"] intValue]; + number.lowLongOfPSN = [[curApp objectForKey:@"NSApplicationProcessSerialNumberLow"] intValue]; } } - return procNum; + return number; } //Send an AppleEvent with a given event ID @@ -646,13 +732,17 @@ andEventID:(AEEventID)eventID AEDisposeDesc(&reply); } +// // // 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]; } @@ -660,19 +750,19 @@ andEventID:(AEEventID)eventID { int playlist = [[sender representedObject] intValue]; if (!isPlayingRadio) { - int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; + int curPlaylist = [currentRemote currentPlaylistIndex]; [[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"]; + [currentRemote switchToEQAtIndex:item]; [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState]; [[eqMenu itemAtIndex:item - 1] setState:NSOnState]; } @@ -681,26 +771,26 @@ andEventID:(AEEventID)eventID { NSString *state = [self runScriptAndReturnResult:@"return player state"]; if ([state isEqualToString:@"playing"]) { - [self sendAEWithEventClass:'hook' andEventID:'Paus']; + [currentRemote play]; [playPauseMenuItem setTitle:@"Play"]; } else if ([state isEqualToString:@"fast forwarding"] || [state isEqualToString:@"rewinding"]) { - [self sendAEWithEventClass:'hook' andEventID:'Paus']; - [self sendAEWithEventClass:'hook' andEventID:'Play']; + [currentRemote play]; + [currentRemote pause]; } 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 @@ -713,6 +803,8 @@ isEqualToString:@"rewinding"]) { [self sendAEWithEventClass:'hook' andEventID:'Rwnd']; } +// Plugin independent selectors + - (void)quitMenuTunes:(id)sender { [NSApp terminate:self]; @@ -753,40 +845,34 @@ isEqualToString:@"rewinding"]) { if (!statusController && [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]; + NSLog(@"%@", trackTime); 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: @@ -798,7 +884,7 @@ isEqualToString:@"rewinding"]) { } statusController = [[StatusWindowController alloc] init]; - [statusController setTrackInfo:stringToShow lines:lines]; + [statusController setTrackInfo:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) @@ -809,30 +895,30 @@ isEqualToString:@"rewinding"]) { - (void)showUpcomingSongs { + int curPlaylist = [currentRemote currentPlaylistIndex]; if (!statusController) { - int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue]; + 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]; 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]; + [statusController setUpcomingSongs:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 - target:self - selector:@selector(fadeAndCloseStatusWindow) - userInfo:nil - repeats:NO]; + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } } @@ -844,6 +930,169 @@ isEqualToString:@"rewinding"]) { statusController = nil; } +- (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: + break; + + case 48: + break; + + case 49: + break; + + case 51: + charcode = NSDeleteFunctionKey; + break; + + case 53: + break; + + case 71: + break; + + case 76: + 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: + 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 { + [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]]; + } +} + /*************************************************************************/ #pragma mark - #pragma mark NSApplication DELEGATE METHODS @@ -868,11 +1117,11 @@ isEqualToString:@"rewinding"]) { refreshTimer = nil; } CloseComponent(asComponent); + [currentRemote halt]; [statusItem release]; [menu release]; // [view release]; [super dealloc]; } - -@end +@end \ No newline at end of file