trackInfoIndex = -1;
lastSongIndex = -1;
- didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
- didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0);
-
+ didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
+ didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
while ([menu numberOfItems] > 0) {
[menu removeItemAtIndex: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];
}
//Update Play/Pause menu item
if (playPauseMenuItem){
- if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
+ if ([currentRemote playerState] == playing) {
[playPauseMenuItem setTitle:@"Pause"];
} else {
[playPauseMenuItem setTitle:@"Play"];
- (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"]) {
+ } else if ((state == forwarding) || (state == rewinding)) {
[currentRemote play];
[currentRemote pause];
} else {
- (void)fastForward:(id)sender
{
- [self sendAEWithEventClass:'hook' andEventID:'Fast'];
+ [currentRemote fastForward];
}
- (void)rewind:(id)sender
{
- [self sendAEWithEventClass:'hook' andEventID:'Rwnd'];
+ [currentRemote rewind];
}
+//
+//
// 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)showCurrentTrackInfo
{
- NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
+ NSString *trackName = [currentRemote currentSongTitle];
if (!statusController && [trackName length]) {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *stringToShow = @"";
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:
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]];
}
}