X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/31ab86a87f78edfdd32810db1ff708ca8f5eaaca..8c2086efaf1ee7419fc91275fdc7426de3fbe7fd:/MenuTunes.m diff --git a/MenuTunes.m b/MenuTunes.m index e8736fa..ca96f36 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -45,6 +45,8 @@ Things to do: - (void)applicationDidFinishLaunching:(NSNotification *)note { currentRemote = [self loadRemote]; + [currentRemote begin]; + asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); [self registerDefaultsIfNeeded]; @@ -56,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 { @@ -204,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); @@ -300,7 +305,6 @@ Things to do: } } - curTrackIndex = -1; //Force update of everything [self timerUpdate]; //Updates dynamic info in the menu [self clearHotKeys]; @@ -332,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) { @@ -436,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]; @@ -450,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]; @@ -470,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]; @@ -503,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]; @@ -523,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 @@ -605,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++) @@ -625,51 +649,16 @@ Things to do: [temp release]; } [self updateMenu]; - curTrackIndex = trackPlayingIndex; + lastSongIndex = 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; - } - } - //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]; } } @@ -686,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(procName); + 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 @@ -721,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]; } @@ -735,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]; } @@ -755,44 +770,51 @@ andEventID:(AEEventID)eventID - (void)playPause:(id)sender { NSString *state = [self runScriptAndReturnResult:@"return player state"]; + NSLog(@"%i", [currentRemote playerState]); 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 { - [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"]; @@ -831,7 +853,7 @@ isEqualToString:@"rewinding"]) { 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]; @@ -839,7 +861,7 @@ isEqualToString:@"rewinding"]) { } 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"]; @@ -847,14 +869,15 @@ isEqualToString:@"rewinding"]) { } 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]; } } { - 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: @@ -877,20 +900,20 @@ 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"]; } @@ -939,24 +962,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; + break; + case 53: + charcode = '\e'; break; - + case 71: + charcode = '\e'; break; case 76: + charcode = '\r'; break; case 96: @@ -1012,6 +1050,7 @@ isEqualToString:@"rewinding"]) { break; case 115: + charcode = NSHomeFunctionKey; break; case 116: @@ -1069,7 +1108,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]]; } } @@ -1098,6 +1137,7 @@ isEqualToString:@"rewinding"]) { refreshTimer = nil; } CloseComponent(asComponent); + [currentRemote halt]; [statusItem release]; [menu release]; // [view release];