X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/e740c3a87c5e9bcf4ef1751b37545fc616592e6c..35486a7ded93b3e89a6b03ec1dbe801f3dfe0edc:/MenuTunes.m diff --git a/MenuTunes.m b/MenuTunes.m index 31509a1..a1121d7 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -10,7 +10,7 @@ Things to do: #import "MenuTunes.h" #import "PreferencesController.h" #import "HotKeyCenter.h" -#import "StatusWindowController.h" +#import "StatusWindow.h" @interface MenuTunes(Private) - (ITMTRemote *)loadRemote; @@ -19,9 +19,7 @@ Things to do: - (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; @@ -38,6 +36,7 @@ Things to do: { if ( ( self = [super init] ) ) { remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; + statusWindow = [StatusWindow sharedWindow]; } return self; } @@ -47,34 +46,19 @@ Things to do: 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))) - { - [self rebuildMenu]; - refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 - target:self - selector:@selector(timerUpdate) - userInfo:nil - repeats:YES]; - - [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil]; - } - 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 isAppRunning]) { + [self iTunesLaunched:nil]; + } else { + [self iTunesTerminated:nil]; } - + statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength]; @@ -88,7 +72,7 @@ Things to do: - (ITMTRemote *)loadRemote { NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath]; - + if (folderPath) { NSArray *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath]; NSEnumerator *enumerator = [bundlePathList objectEnumerator]; @@ -130,7 +114,7 @@ Things to do: { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; if (![defaults objectForKey:@"menu"]) { - bool found = NO; + BOOL found = NO; NSMutableDictionary *loginwindow; NSMutableArray *loginarray; int i; @@ -163,10 +147,14 @@ Things to do: } } + // + //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); @@ -175,6 +163,8 @@ Things to do: AEDisposeDesc(&scriptDesc); AEDisposeDesc(&resultDesc); + + CloseComponent(asComponent); } } } @@ -209,9 +199,9 @@ Things to do: trackInfoIndex = -1; lastSongIndex = -1; - didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0); - didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0); - + lastPlaylistIndex = -1; + didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0); + didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0); while ([menu numberOfItems] > 0) { [menu removeItemAtIndex:0]; @@ -235,8 +225,7 @@ Things to do: keyEquivalent:@""]; [playPauseMenuItem setTarget:self]; - if (tempCombo) - { + if (tempCombo) { [self setKeyEquivalentForCode:[tempCombo keyCode] andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem]; [tempCombo release]; @@ -248,8 +237,7 @@ Things to do: keyEquivalent:@""]; [nextTrack setTarget:self]; - if (tempCombo) - { + if (tempCombo) { [self setKeyEquivalentForCode:[tempCombo keyCode] andModifiers:[tempCombo modifiers] onItem:nextTrack]; [tempCombo release]; @@ -261,45 +249,44 @@ Things to do: keyEquivalent:@""]; [prevTrack setTarget:self]; - if (tempCombo) - { + 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:@""]) { [menu addItem:[NSMenuItem separatorItem]]; } @@ -317,7 +304,7 @@ Things to do: NSMenuItem *menuItem; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) { + if (!isAppRunning) { return; } @@ -333,8 +320,7 @@ Things to do: [self rebuildEQPresetsMenu]; } - if (trackInfoIndex > -1) - { + if (trackInfoIndex > -1) { NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; curSongName = [currentRemote currentSongTitle]; @@ -365,25 +351,25 @@ Things to do: if (!isPlayingRadio) { if ([defaults boolForKey:@"showTime"]) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [self runScriptAndReturnResult:@"return time of current track"]] - action:nil - keyEquivalent:@""]; + 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:@""]; + 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]; } @@ -391,8 +377,8 @@ Things to do: if ([defaults boolForKey:@"showName"]) { menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] - action:nil - keyEquivalent:@""]; + action:nil + keyEquivalent:@""]; [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; [menuItem release]; } @@ -443,6 +429,7 @@ Things to do: int curIndex = [currentRemote currentPlaylistIndex]; int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curIndex]; int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; + if (!isPlayingRadio) { if (numSongs > 0) { int curTrack = [currentRemote currentSongIndex]; @@ -478,27 +465,26 @@ Things to do: NSArray *playlists = [currentRemote playlists]; int i, curPlaylist = [currentRemote currentPlaylistIndex]; - if (isPlayingRadio) - { + if (isPlayingRadio) { curPlaylist = 0; } - if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems])) return; [playlistMenu release]; playlistMenu = [[NSMenu alloc] initWithTitle:@""]; - for (i = 1; i < [playlists count]; 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]; @@ -520,11 +506,13 @@ Things to do: 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]; @@ -575,163 +563,110 @@ Things to do: } } -//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 = [currentRemote currentSongIndex]; int playlist = [currentRemote currentPlaylistIndex]; + PlayerState playerState = [currentRemote playerState]; - 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; + if ((playlist > 0) || playerState != stopped) { + int trackPlayingIndex = [currentRemote currentSongIndex]; + + 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]; } + } 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]; lastSongIndex = trackPlayingIndex; - } - } - //Update Play/Pause menu item - if (playPauseMenuItem){ - if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) { - [playPauseMenuItem setTitle:@"Pause"]; } else { - [playPauseMenuItem setTitle:@"Play"]; + if (playlist != lastPlaylistIndex) { + 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]; + } + + if (!isPlayingRadio) { + int i; + for (i = 0; i < [playlistMenu numberOfItems]; i++) + { + [[playlistMenu itemAtIndex:i] setState:NSOffState]; + } + [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; + } + + [self updateMenu]; + lastSongIndex = trackPlayingIndex; + lastPlaylistIndex = playlist; + } + } + //Update Play/Pause menu item + if (playPauseMenuItem){ + if (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]; + refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; [self rebuildMenu]; //Rebuild the menu since no songs will be playing + [self rebuildPlaylistMenu]; [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:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self]; + [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]; - [[[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 @@ -769,14 +704,14 @@ andEventID:(AEEventID)eventID - (void)playPause:(id)sender { - NSString *state = [self runScriptAndReturnResult:@"return player state"]; - if ([state isEqualToString:@"playing"]) { - [currentRemote play]; + PlayerState state = [currentRemote playerState]; + + if (state == playing) { + [currentRemote pause]; [playPauseMenuItem setTitle:@"Play"]; - } else if ([state isEqualToString:@"fast forwarding"] || [state -isEqualToString:@"rewinding"]) { - [currentRemote play]; + } else if ((state == forwarding) || (state == rewinding)) { [currentRemote pause]; + [currentRemote play]; } else { [currentRemote play]; [playPauseMenuItem setTitle:@"Pause"]; @@ -795,26 +730,26 @@ isEqualToString:@"rewinding"]) { - (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]; } -- (void)openiTunes:(id)sender -{ - [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"]; -} - - (void)showPreferences:(id)sender { if (!prefsController) { @@ -823,10 +758,9 @@ isEqualToString:@"rewinding"]) { } } - - (void)closePreferences { - if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) { + if (isAppRunning) { [self setupHotKeys]; } [prefsController release]; @@ -841,8 +775,8 @@ 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 = @""; @@ -865,7 +799,6 @@ isEqualToString:@"rewinding"]) { if ([defaults boolForKey:@"showTime"]) { NSString *trackTime = [currentRemote currentSongLength]; - NSLog(@"%@", trackTime); if ([trackTime length]) { stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime]; } @@ -883,20 +816,19 @@ isEqualToString:@"rewinding"]) { } } - statusController = [[StatusWindowController alloc] init]; - [statusController setTrackInfo:stringToShow]; + [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 { int curPlaylist = [currentRemote currentPlaylistIndex]; - if (!statusController) { + if (!statusWindow) { int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist]; if (numSongs > 0) { @@ -905,7 +837,7 @@ isEqualToString:@"rewinding"]) { int i; NSString *songs = @""; - statusController = [[StatusWindowController alloc] init]; + statusWindow = [ITTransientStatusWindow sharedWindow]; for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong = [currentRemote songTitleAtIndex:i]; @@ -913,7 +845,7 @@ isEqualToString:@"rewinding"]) { songs = [songs stringByAppendingString:@"\n"]; } } - [statusController setUpcomingSongs:songs]; + [statusWindow setText:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) @@ -925,9 +857,7 @@ isEqualToString:@"rewinding"]) { - (void)fadeAndCloseStatusWindow { - [statusController fadeWindowOut]; - [statusController release]; - statusController = nil; + [statusWindow orderOut:self]; } - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers @@ -944,10 +874,8 @@ isEqualToString:@"rewinding"]) { { shiftKey, NSShiftKeyMask }, }; - for (i = 0; i < 6; i++) - { - if (modifiers & carbonToCocoa[i][0]) - { + for (i = 0; i < 6; i++) { + if (modifiers & carbonToCocoa[i][0]) { cocoaModifiers += carbonToCocoa[i][1]; } } @@ -957,25 +885,39 @@ isEqualToString:@"rewinding"]) { 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: @@ -1031,6 +973,7 @@ isEqualToString:@"rewinding"]) { break; case 115: + charcode = NSHomeFunctionKey; break; case 116: @@ -1088,7 +1031,7 @@ isEqualToString:@"rewinding"]) { 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]]; } } @@ -1116,7 +1059,6 @@ isEqualToString:@"rewinding"]) { [refreshTimer invalidate]; refreshTimer = nil; } - CloseComponent(asComponent); [currentRemote halt]; [statusItem release]; [menu release]; @@ -1124,4 +1066,4 @@ isEqualToString:@"rewinding"]) { [super dealloc]; } -@end \ No newline at end of file +@end