From 796f8360ac05b39085aef9f202f635a04ba6834e Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Wed, 19 Feb 2003 08:43:21 +0000 Subject: [PATCH] Stripped out older stuff. It's better now :) Fixed stupidness in the plugin. --- ITMTRemote.h | 1 + ITMTRemote.m | 5 +++ MenuTunes.h | 4 +- MenuTunes.m | 97 ++++++----------------------------------- PreferencesController.m | 14 ++++-- iTunesRemote.h | 2 +- iTunesRemote.m | 61 ++++++++++++++++---------- 7 files changed, 71 insertions(+), 113 deletions(-) diff --git a/ITMTRemote.h b/ITMTRemote.h index 735e11e..1d76786 100755 --- a/ITMTRemote.h +++ b/ITMTRemote.h @@ -79,6 +79,7 @@ typedef enum {stopped = -1, paused, playing, rewinding, forwarding} PlayerState; */ - (BOOL)halt; +- (BOOL)isAppRunning; - (PlayerState)playerState; - (NSArray *)playlists; diff --git a/ITMTRemote.m b/ITMTRemote.m index a8270c6..8653e5f 100755 --- a/ITMTRemote.m +++ b/ITMTRemote.m @@ -33,6 +33,11 @@ return NO; } +- (BOOL)isAppRunning +{ + return NO; +} + - (PlayerState)playerState { return stopped; diff --git a/MenuTunes.h b/MenuTunes.h index 5dc22c5..d4807fd 100755 --- a/MenuTunes.h +++ b/MenuTunes.h @@ -26,7 +26,6 @@ { ITStatusItem *statusItem; NSMenu *menu; - ComponentInstance asComponent; ITMTRemote *currentRemote; NSMutableArray *remoteArray; @@ -35,7 +34,7 @@ int trackInfoIndex, lastSongIndex; bool isPlayingRadio; - ProcessSerialNumber iTunesPSN; + bool isAppRunning; bool didHaveAlbumName, didHaveArtistName; //Helper variable for creating the menu //For upcoming songs @@ -58,7 +57,6 @@ - (void)registerDefaultsIfNeeded; - (void)rebuildMenu; - (void)clearHotKeys; -- (ProcessSerialNumber)iTunesPSN; - (void)closePreferences; @end diff --git a/MenuTunes.m b/MenuTunes.m index 477201e..487a5bb 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 @@ -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; } @@ -481,14 +483,13 @@ 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:@""]; @@ -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 { @@ -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 @@ -824,7 +756,7 @@ andEventID:(AEEventID)eventID - (void)closePreferences { - if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) { + if (isAppRunning) { [self setupHotKeys]; } [prefsController release]; @@ -1128,7 +1060,6 @@ andEventID:(AEEventID)eventID [refreshTimer invalidate]; refreshTimer = nil; } - CloseComponent(asComponent); [currentRemote halt]; [statusItem release]; [menu release]; diff --git a/PreferencesController.m b/PreferencesController.m index 3a9ecd3..0e8c372 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -134,7 +134,6 @@ - (IBAction)apply:(id)sender { - ProcessSerialNumber psn; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [defaults setObject:myItems forKey:@"menu"]; @@ -210,9 +209,16 @@ [defaults setInteger:5 forKey:@"SongsInAdvance"]; } - psn = [mt iTunesPSN]; - if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) { - [mt rebuildMenu]; + { + NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications]; + int i; + + for (i = 0; i < [apps count]; i++) { + if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] + isEqualToString:@"iTunes"]) { + [mt rebuildMenu]; + } + } } [mt clearHotKeys]; } diff --git a/iTunesRemote.h b/iTunesRemote.h index 79821c6..7dd5145 100755 --- a/iTunesRemote.h +++ b/iTunesRemote.h @@ -14,7 +14,7 @@ @interface iTunesRemote : ITMTRemote { - ComponentInstance asComponent; + ComponentInstance asComponent; //We will remove this when we are all AEs ProcessSerialNumber iTunesPSN; } - (ProcessSerialNumber)iTunesPSN; diff --git a/iTunesRemote.m b/iTunesRemote.m index 3381cb3..5bab47e 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -14,7 +14,7 @@ - (NSString *)information; { - return @"Default MenuTunes plugin to control iTunes."; + return @"Default MenuTunes plugin to control iTunes. Written by iThink Software."; } - (NSImage *)icon @@ -25,19 +25,22 @@ - (BOOL)begin { iTunesPSN = [self iTunesPSN]; + + //We won't need this once we're pure AEs asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); //Register for application termination in NSWorkspace [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil]; - NSLog(@"iTunes Plugin loaded"); return YES; } - (BOOL)halt { iTunesPSN.highLongOfPSN = kNoProcess; + + //We won't need this once we're pure AEs CloseComponent(asComponent); //Unregister for application termination in NSWorkspace @@ -46,26 +49,18 @@ return YES; } -- (void)applicationLaunched:(NSNotification *)note +- (BOOL)isAppRunning { - NSDictionary *info = [note userInfo]; - - if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) { - iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue]; - iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue]; - - [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidLaunchNotification" object:nil]; - } -} - -- (void)applicationTerminated:(NSNotification *)note -{ - NSDictionary *info = [note userInfo]; + NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications]; + int i; - if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) { - iTunesPSN.highLongOfPSN = kNoProcess; - [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil]; + for (i = 0; i < [apps count]; i++) { + if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] + isEqualToString:@"iTunes"]) { + return YES; + } } + return NO; } - (PlayerState)playerState @@ -92,8 +87,7 @@ int i; int numPresets = [[self runScriptAndReturnResult:@"get number of playlists"] intValue]; NSMutableArray *presets = [[NSMutableArray alloc] init]; - - for (i = 0; i < numPresets; i++) { + for (i = 1; i <= numPresets; i++) { [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of playlist %i", i]]]; } @@ -199,7 +193,7 @@ int numPresets = [[self runScriptAndReturnResult:@"get number of EQ presets"] intValue]; NSMutableArray *presets = [[NSMutableArray alloc] init]; - for (i = 0; i < numPresets; i++) { + for (i = 1; i <= numPresets; i++) { [presets addObject:[self runScriptAndReturnResult:[NSString stringWithFormat:@"get name of EQ preset %i", i]]]; } @@ -302,6 +296,29 @@ return number; } +- (void)applicationLaunched:(NSNotification *)note +{ + NSDictionary *info = [note userInfo]; + + if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) { + iTunesPSN.highLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue]; + iTunesPSN.lowLongOfPSN = [[info objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue]; + + [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidLaunchNotification" object:nil]; + } +} + +- (void)applicationTerminated:(NSNotification *)note +{ + NSDictionary *info = [note userInfo]; + + if ([[info objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) { + iTunesPSN.highLongOfPSN = kNoProcess; + [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTRemoteAppDidTerminateNotification" object:nil]; + } +} + +//This is just temporary - (NSString *)runScriptAndReturnResult:(NSString *)script { AEDesc scriptDesc, resultDesc; -- 2.20.1