From b47e6e5323fd89a08e418d1b635d9e8dcb48f043 Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Thu, 6 Feb 2003 10:47:56 +0000 Subject: [PATCH] Easy parts of the plugin are done. Small improvements in MenuTunes main class too. --- MenuTunes.m | 144 +++++++++++++++++++++++++++---------------------- iTunesRemote.h | 5 +- iTunesRemote.m | 96 +++++++++++++++++++++++++++------ 3 files changed, 163 insertions(+), 82 deletions(-) diff --git a/MenuTunes.m b/MenuTunes.m index e8736fa..884af16 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -56,10 +56,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 { @@ -605,11 +607,30 @@ 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 = [[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 (isPlayingRadio && !wasPlayingRadio) { @@ -626,50 +647,16 @@ Things to do: } [self updateMenu]; curTrackIndex = trackPlayingIndex; + curPlaylistIndex = playlist; } - 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 +673,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,9 +730,13 @@ andEventID:(AEEventID)eventID AEDisposeDesc(&reply); } +// // // Selectors - called from status item menu // +// + +// Plugin dependent selectors - (void)playTrack:(id)sender { @@ -754,6 +767,7 @@ andEventID:(AEEventID)eventID - (void)playPause:(id)sender { + NSString *rawr; NSString *state = [self runScriptAndReturnResult:@"return player state"]; if ([state isEqualToString:@"playing"]) { [self sendAEWithEventClass:'hook' andEventID:'Paus']; @@ -770,12 +784,12 @@ isEqualToString:@"rewinding"]) { - (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 @@ -788,6 +802,8 @@ isEqualToString:@"rewinding"]) { [self sendAEWithEventClass:'hook' andEventID:'Rwnd']; } +// Plugin independent selectors + - (void)quitMenuTunes:(id)sender { [NSApp terminate:self]; diff --git a/iTunesRemote.h b/iTunesRemote.h index 0fbfa55..1599e2d 100755 --- a/iTunesRemote.h +++ b/iTunesRemote.h @@ -14,8 +14,7 @@ @interface iTunesRemote : ITMTRemote { - + ProcessSerialNumber iTunesPSN; } - - +- (ProcessSerialNumber)iTunesPSN; @end diff --git a/iTunesRemote.m b/iTunesRemote.m index 36a38db..8886102 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -1,6 +1,5 @@ #import "iTunesRemote.h" - @implementation iTunesRemote + (id)remote @@ -10,12 +9,12 @@ - (NSString *)title { - return nil; + return @"iTunes Plug-in"; } - (NSString *)information; { - return nil; + return @"Default MenuTunes plugin to control iTunes."; } - (NSImage *)icon @@ -25,12 +24,20 @@ - (BOOL)begin { - return NO; + iTunesPSN = [self iTunesPSN]; + + //Register for application termination in NSWorkspace + + NSLog(@"iTunes Plugin loaded"); + return YES; } - (BOOL)halt { - return NO; + iTunesPSN.highLongOfPSN = kNoProcess; + + //Unregister for application termination in NSWorkspace + return YES; } - (NSArray *)sources @@ -50,46 +57,76 @@ - (int)currentPlaylistIndex { + NSString *result; + result = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pidx" + fromObjectByKey:@"pPla" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; + NSLog(@"result: %@", result); return nil; } - (NSString *)songTitleAtIndex { - return nil; + return nil; } - (int)currentSongIndex { + NSString *result; + result = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pidx" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; + NSLog(@"result: %@", result); return nil; } - (NSString *)currentSongTitle { - return nil; + return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pnam" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; } - (NSString *)currentSongArtist { - return nil; + return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pArt" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; } - (NSString *)currentSongAlbum { - return nil; + return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pAlb" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; } - (NSString *)currentSongGenre { - return nil; + return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pGen" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; } - (NSString *)currentSongLength { - return nil; + return [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKey:@"pDur" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; } - (NSString *)currentSongRemaining { + NSString* duration = [[ITAppleEventCenter sharedCenter] + sendTwoTierAEWithRequestedKey:@"pDur" + fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; + NSString* current = [[ITAppleEventCenter sharedCenter] + sendAEWithRequestedKey:@"pPos" + eventClass:@"core" eventID:@"getd" + appPSN:[self iTunesPSN]]; + NSLog(@"%@ %@", duration, current); + //return [[NSNumber numberWithInt:duration - current] stringValue]; return nil; } @@ -100,22 +137,30 @@ - (BOOL)play { - return NO; + [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Play" + appPSN:[self iTunesPSN]]; + return YES; } - (BOOL)pause { - return NO; + [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Paus" + appPSN:[self iTunesPSN]]; + return YES; } - (BOOL)goToNextSong { - return NO; + [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Next" + appPSN:[self iTunesPSN]]; + return YES; } - (BOOL)goToPreviousSong { - return NO; + [[ITAppleEventCenter sharedCenter] sendAEWithEventClass:@"hook" eventID:@"Prev" + appPSN:[self iTunesPSN]]; + return YES; } - (BOOL)goToNextPlaylist @@ -148,4 +193,25 @@ return NO; } +- (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; +} + @end -- 2.20.1