X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/7bc6c0f1e85a6460ae61a80a80f974931924ec48..62ce32fc935d82a28a4440d07536eae205bfb108:/MenuTunes.m?ds=inline diff --git a/MenuTunes.m b/MenuTunes.m index 477201e..1dd7df6 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -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; @@ -50,14 +48,12 @@ Things to do: [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil]; - asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); - [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 @@ -130,7 +126,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 +159,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 +175,8 @@ Things to do: AEDisposeDesc(&scriptDesc); AEDisposeDesc(&resultDesc); + + CloseComponent(asComponent); } } } @@ -316,7 +318,7 @@ Things to do: NSMenuItem *menuItem; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) { + if (!isAppRunning) { return; } @@ -458,7 +460,7 @@ Things to do: 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 { @@ -481,19 +483,18 @@ Things to do: { 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]; } @@ -574,38 +575,6 @@ 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 { @@ -614,7 +583,7 @@ Things to do: int playlist = [currentRemote currentPlaylistIndex]; if (trackPlayingIndex != lastSongIndex) { - bool wasPlayingRadio = isPlayingRadio; + BOOL wasPlayingRadio = isPlayingRadio; isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; if (isPlayingRadio && !wasPlayingRadio) { int i; @@ -634,7 +603,7 @@ Things to do: else { if (playlist != [currentRemote currentPlaylistIndex]) { - bool wasPlayingRadio = isPlayingRadio; + BOOL wasPlayingRadio = isPlayingRadio; isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; if (isPlayingRadio && !wasPlayingRadio) { int i; @@ -665,10 +634,7 @@ Things to do: - (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]; @@ -679,6 +645,8 @@ Things to do: - (void)iTunesTerminated:(NSNotification *)note { + isAppRunning = NO; + [menu release]; menu = [[NSMenu alloc] initWithTitle:@""]; [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self]; @@ -691,42 +659,6 @@ Things to do: [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,8 +701,8 @@ andEventID:(AEEventID)eventID [currentRemote pause]; [playPauseMenuItem setTitle:@"Play"]; } else if ((state == forwarding) || (state == rewinding)) { - [currentRemote play]; [currentRemote pause]; + [currentRemote play]; } else { [currentRemote play]; [playPauseMenuItem setTitle:@"Pause"]; @@ -790,11 +722,13 @@ andEventID:(AEEventID)eventID - (void)fastForward:(id)sender { [currentRemote fastForward]; + [playPauseMenuItem setTitle:@"Play"]; } - (void)rewind:(id)sender { [currentRemote rewind]; + [playPauseMenuItem setTitle:@"Play"]; } // @@ -824,7 +758,7 @@ andEventID:(AEEventID)eventID - (void)closePreferences { - if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) { + if (isAppRunning) { [self setupHotKeys]; } [prefsController release]; @@ -1128,7 +1062,6 @@ andEventID:(AEEventID)eventID [refreshTimer invalidate]; refreshTimer = nil; } - CloseComponent(asComponent); [currentRemote halt]; [statusItem release]; [menu release];