#import "MenuTunes.h"
#import "PreferencesController.h"
#import "HotKeyCenter.h"
-#import "StatusWindowController.h"
@interface MenuTunes(Private)
- (ITMTRemote *)loadRemote;
- (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;
{
if ( ( self = [super init] ) ) {
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+ statusWindow = [ITTransientStatusWindow sharedWindow];
}
return self;
}
currentRemote = [self loadRemote];
[currentRemote begin];
- asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-
+ [[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
selector:@selector(timerUpdate)
userInfo:nil
repeats:YES];
-
- [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
}
else
{
[[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;
}
{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (![defaults objectForKey:@"menu"]) {
- bool found = NO;
+ BOOL found = NO;
NSMutableDictionary *loginwindow;
NSMutableArray *loginarray;
int i;
}
}
+ //
+ //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);
AEDisposeDesc(&scriptDesc);
AEDisposeDesc(&resultDesc);
+
+ CloseComponent(asComponent);
}
}
}
int i;
trackInfoIndex = -1;
- didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
- didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0);
-
+ lastSongIndex = -1;
+ didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
+ didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
while ([menu numberOfItems] > 0) {
[menu removeItemAtIndex:0];
}
}
- curTrackIndex = -1; //Force update of everything
[self timerUpdate]; //Updates dynamic info in the menu
[self clearHotKeys];
NSMenuItem *menuItem;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
+ if (!isAppRunning) {
return;
}
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) {
if (!isPlayingRadio) {
if ([defaults boolForKey:@"showTime"]) {
- menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [self runScriptAndReturnResult:@"return time of current track"]]
+ menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]]
action:nil
keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
//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];
- [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
+ [songItem setRepresentedObject:[NSNumber numberWithInt:i + 1]];
[upcomingSongsMenu addItem:songItem];
[songItem release];
} else {
- (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 = 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];
}
//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];
}
[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 trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
-
- if (trackPlayingIndex != curTrackIndex) {
- 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;
- }
- 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 ([currentRemote playerState] != stopped) {
+ 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++)
[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"];
+ else
+ {
+ 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;
+ }
+ }
+ //Update Play/Pause menu item
+ if (playPauseMenuItem){
+ if ([currentRemote playerState] == playing) {
+ [playPauseMenuItem setTitle:@"Pause"];
+ } else {
+ [playPauseMenuItem setTitle:@"Play"];
+ }
}
}
}
- (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];
-
- [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
}
- (void)iTunesTerminated:(NSNotification *)note
{
- [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+ isAppRunning = NO;
[menu release];
menu = [[NSMenu alloc] initWithTitle:@""];
[[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
-{
- NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
- ProcessSerialNumber number;
- int i;
-
- 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 number;
-}
-
-//Send an AppleEvent with a given event ID
-- (void)sendAEWithEventClass:(AEEventClass)eventClass
-andEventID:(AEEventID)eventID
-{
- OSType iTunesType = 'hook';
- AppleEvent event, reply;
-
- AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-
- AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
- AEDisposeDesc(&event);
- AEDisposeDesc(&reply);
-}
-
//
//
// Selectors - called from status item menu
- (void)playTrack:(id)sender
{
- [self runScriptAndReturnResult:[NSString stringWithFormat:@"play track %i of current playlist", [[sender representedObject] intValue]]];
+ [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
[self updateMenu];
}
{
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];
}
- (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 if ((state == forwarding) || (state == rewinding)) {
+ [currentRemote pause];
+ [currentRemote play];
} else {
- [self sendAEWithEventClass:'hook' andEventID:'Play'];
+ [currentRemote play];
[playPauseMenuItem setTitle:@"Pause"];
}
}
- (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"];
- (void)closePreferences
{
- if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) {
+ if (isAppRunning) {
[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 = @"";
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];
}
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"];
}
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];
}
}
{
- 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];
+ [statusWindow setTrackInfo:stringToShow];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
- (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];
+ [statusWindow setUpcomingSongs:songs];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
- (void)fadeAndCloseStatusWindow
{
- [statusController fadeWindowOut];
- [statusController release];
- statusController = nil;
+ [statusWindow orderOut:self];
}
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
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;
+ break;
+
case 53:
+ charcode = '\e';
break;
-
+
case 71:
+ charcode = '\e';
break;
case 76:
+ charcode = '\r';
break;
case 96:
break;
case 115:
+ charcode = NSHomeFunctionKey;
break;
case 116:
keyTrans = KeyTranslate(kchr, code, &state);
charCode = keyTrans;
[item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]];
- } else {
+ } else if (charcode != 'b') {
[item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]];
}
}
[refreshTimer invalidate];
refreshTimer = nil;
}
- CloseComponent(asComponent);
+ [currentRemote halt];
[statusItem release];
[menu release];
// [view release];
git.ithinksw.org / MenuTunes.git / blobdiff