X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/8fe29f5b163e9acbda7b317b406a5835bac8a95d..2413c9c1fe8cd8d9b4d0487d6354568a02727d7f:/OldMainController.m?ds=sidebyside diff --git a/OldMainController.m b/OldMainController.m index ff98908..6ac5ab4 100755 --- a/OldMainController.m +++ b/OldMainController.m @@ -5,10 +5,10 @@ @interface MainController(Private) - (ITMTRemote *)loadRemote; -- (void)updateMenu; - (void)rebuildUpcomingSongsMenu; - (void)rebuildPlaylistMenu; - (void)rebuildEQPresetsMenu; +- (void)updateRatingMenu; - (void)setupHotKeys; - (void)timerUpdate; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers @@ -47,6 +47,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)note { + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; currentRemote = [self loadRemote]; [currentRemote begin]; @@ -62,8 +63,10 @@ selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; - - [self registerDefaults]; + + if ( ! [defaults objectForKey:@"menu"] ) { // If this is nil, defaults have never been registered. + [[PreferencesController sharedPrefs] registerDefaults]; + } statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] @@ -129,34 +132,43 @@ - (void)applicationLaunched:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + unichar fullstar = 0x2605; + unichar emptystar = 0x2606; + NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1]; + NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1]; + //Build the song rating menu + ratingMenu = [[NSMenu alloc] initWithTitle:@""]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:0]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:20]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:40]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:60]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:80]; + [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:100]; [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil]; - - [self rebuildMenu]; - [statusItem setMenu:menu]; [self setupHotKeys]; + [self rebuildMenu]; isAppRunning = ITMTRemotePlayerRunning; - return; } - - isAppRunning = ITMTRemotePlayerRunning; } - (void)applicationTerminated:(NSNotification *)note { - if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""]; - [[notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self]; + [notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""]; [notRunningMenu addItem:[NSMenuItem separatorItem]]; - [[notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self]; - [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self]; - [statusItem setMenu:[notRunningMenu autorelease]]; + [notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""]; + [notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""]; [refreshTimer invalidate]; [refreshTimer release]; refreshTimer = nil; [self clearHotKeys]; - isAppRunning = NO; - return; + isAppRunning = ITMTRemotePlayerNotRunning; + + [ratingMenu release]; + + [statusItem setMenu:[notRunningMenu autorelease]]; } } @@ -165,89 +177,6 @@ #pragma mark INSTANCE METHODS /*************************************************************************/ -- (void)registerDefaults -{ - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if (![defaults objectForKey:@"menu"]) { - BOOL found = NO; - NSMutableDictionary *loginwindow; - NSMutableArray *loginarray; - int i; - - [defaults setObject: - [NSArray arrayWithObjects: - @"Play/Pause", - @"Next Track", - @"Previous Track", - @"Fast Forward", - @"Rewind", - @"", - @"Upcoming Songs", - @"Playlists", - @"Song Rating", - @"", - @"PreferencesÉ", - @"Quit", - @"", - @"Current Track Info", - nil] forKey:@"menu"]; - - [defaults synchronize]; - loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy]; - loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - - for (i = 0; i < [loginarray count]; i++) { - NSDictionary *tempDict = [loginarray objectAtIndex:i]; - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString: - [[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { - found = YES; - } - } - - // - //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); - - OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); - - AEDisposeDesc(&scriptDesc); - AEDisposeDesc(&resultDesc); - - CloseComponent(asComponent); - } - } - } - - if (![defaults integerForKey:@"SongsInAdvance"]) - { - [defaults setInteger:5 forKey:@"SongsInAdvance"]; - } - - if (![defaults objectForKey:@"showName"]) { - [defaults setBool:YES forKey:@"showName"]; - } - - if (![defaults objectForKey:@"showArtist"]) { - [defaults setBool:YES forKey:@"showArtist"]; - } - - if (![defaults objectForKey:@"showAlbum"]) { - [defaults setBool:NO forKey:@"showAlbum"]; - } - - if (![defaults objectForKey:@"showTime"]) { - [defaults setBool:NO forKey:@"showTime"]; - } -} - - (void)startTimerInNewThread { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -264,40 +193,51 @@ //Recreate the status item menu - (void)rebuildMenu { - NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSArray *myMenu = [defaults arrayForKey:@"menu"]; + int playlist = [currentRemote currentPlaylistIndex]; int i; + if ([currentRemote playerRunningState] == ITMTRemotePlayerNotRunning) { + return; + } + trackInfoIndex = -1; - lastSongIndex = -1; lastPlaylistIndex = -1; - didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0); - didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0); - while ([menu numberOfItems] > 0) { - [menu removeItemAtIndex:0]; - } + [menu release]; + menu = [[NSMenu alloc] initWithTitle:@""]; + + playPauseItem = nil; - playPauseMenuItem = nil; upcomingSongsItem = nil; - songRatingMenuItem = nil; + [upcomingSongsMenu release]; + upcomingSongsMenu = nil; + + if (ratingItem) { + [ratingItem setSubmenu:nil]; + } + playlistItem = nil; [playlistMenu release]; playlistMenu = nil; + eqItem = nil; [eqMenu release]; eqMenu = nil; + //Build the custom menu for (i = 0; i < [myMenu count]; i++) { NSString *item = [myMenu objectAtIndex:i]; if ([item isEqualToString:@"Play/Pause"]) { KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"]; - playPauseMenuItem = [menu addItemWithTitle:@"Play" + playPauseItem = [menu addItemWithTitle:@"Play" action:@selector(playPause:) keyEquivalent:@""]; if (tempCombo) { [self setKeyEquivalentForCode:[tempCombo keyCode] - andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem]; + andModifiers:[tempCombo modifiers] onItem:playPauseItem]; [tempCombo release]; } } else if ([item isEqualToString:@"Next Track"]) { @@ -330,10 +270,17 @@ [menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""]; + } else if ([item isEqualToString:@"Show Player"]) { + [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]] + action:@selector(showPlayer:) + keyEquivalent:@""]; } else if ([item isEqualToString:@"Upcoming Songs"]) { upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:nil keyEquivalent:@""]; + upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; + [upcomingSongsItem setSubmenu:upcomingSongsMenu]; + [upcomingSongsItem setEnabled:NO]; } else if ([item isEqualToString:@"Playlists"]) { playlistItem = [menu addItemWithTitle:@"Playlists" action:nil @@ -356,42 +303,101 @@ action:nil keyEquivalent:@""]; } else if ([item isEqualToString:@"Song Rating"]) { - unichar fullstar = 0x2605; - unichar emptystar = 0x2606; - NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1]; - NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1]; - NSMenuItem *item; - - songRatingMenuItem = [menu addItemWithTitle:@"Song Rating" + ratingItem = [menu addItemWithTitle:@"Song Rating" action:nil keyEquivalent:@""]; + [ratingItem setSubmenu:ratingMenu]; + } else if ([item isEqualToString:@""]) { + [menu addItem:[NSMenuItem separatorItem]]; + } + } + + if (playlistItem) { + [self rebuildPlaylistMenu]; + } + + if (eqItem) { + [self rebuildEQPresetsMenu]; + } + + isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist); + + if (upcomingSongsItem) { + [self rebuildUpcomingSongsMenu]; + } + + if (ratingItem) { + if (isPlayingRadio || !playlist) { + [ratingItem setEnabled:NO]; + } else { + int currentSongRating = ([currentRemote currentSongRating] * 5); + [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState]; + lastSongRating = currentSongRating; + [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState]; + [ratingItem setEnabled:YES]; + } + } + + //Set the new unique song identifier + lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain]; + + //If we're in a playlist or radio mode + if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) { + NSString *title; + + if ( (i = [menu indexOfItemWithTitle:@"No Song"]) ) { + if ( (i > -1) ) { + [menu removeItemAtIndex:i]; + [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i]; + } + } + + title = [currentRemote currentSongTitle]; + + if (!isPlayingRadio) { + if ([defaults boolForKey:@"showTime"]) { + NSString *length = [currentRemote currentSongLength]; + char character = [length characterAtIndex:0]; + if ( (character > '0') && (character < '9') ) { + [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; + } + } - ratingMenu = [[NSMenu alloc] initWithTitle:@""]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:0]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:20]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:40]; + if ([defaults boolForKey:@"showTrackRating"]) { + if (title) { //Check to see if there's a song playing + [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", [[ratingMenu itemAtIndex:[currentRemote currentSongRating] * 5] title]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; + } + } - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:60]; + if ([defaults boolForKey:@"showArtist"]) { + NSString *artist = [currentRemote currentSongArtist]; + if ([artist length] > 0) { + [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; + } + } - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:80]; + if ([defaults boolForKey:@"showTrackNumber"]) { + int track = [currentRemote currentSongTrack]; + int total = [currentRemote currentAlbumTrackCount]; + if (total > 0) { + [menu insertItemWithTitle:[NSString stringWithFormat:@" Track %i of %i", track, total] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; + } + } - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:100]; - } else if ([item isEqualToString:@""]) { - [menu addItem:[NSMenuItem separatorItem]]; + if ([defaults boolForKey:@"showAlbum"]) { + NSString *album = [currentRemote currentSongAlbum]; + if ([album length] > 0) { + [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; + } + } + } + + if ([title length] > 0) { + [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; } } - [self updateMenu]; - //[self timerUpdate]; //Updates dynamic info in the menu + [statusItem setMenu:menu]; [self clearHotKeys]; [self setupHotKeys]; @@ -436,13 +442,7 @@ - (void)rebuildPlaylistMenu { NSArray *playlists = [currentRemote playlists]; - int i, curPlaylist = [currentRemote currentPlaylistIndex]; - - if (isPlayingRadio) { - curPlaylist = 0; - } - if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems])) - return; + int i, currentPlaylist = [currentRemote currentPlaylistIndex]; [playlistMenu release]; playlistMenu = [[NSMenu alloc] initWithTitle:@""]; @@ -451,15 +451,15 @@ NSString *playlistName = [playlists objectAtIndex:i]; NSMenuItem *tempItem; tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""]; - [tempItem setRepresentedObject:[NSNumber numberWithInt:i + 1]]; + [tempItem setTag:i + 1]; [playlistMenu addItem:tempItem]; [tempItem release]; } [playlistItem setSubmenu:playlistMenu]; [playlistItem setEnabled:YES]; - if (curPlaylist) { - [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState]; + if (!isPlayingRadio && currentPlaylist) { + [[playlistMenu itemAtIndex:currentPlaylist - 1] setState:NSOnState]; } } @@ -467,287 +467,68 @@ - (void)rebuildEQPresetsMenu { NSArray *eqPresets = [currentRemote eqPresets]; - NSMenuItem *enabledItem; int i; - if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems])) - return; - - [eqMenu release]; + [eqMenu autorelease]; eqMenu = [[NSMenu alloc] initWithTitle:@""]; - enabledItem = [eqMenu addItemWithTitle:@"Enabled" - action:@selector(selectEQPreset:) - keyEquivalent:@""]; - [enabledItem setTag:-1]; - - if ([currentRemote equalizerEnabled]) { - [enabledItem setState:NSOnState]; - } - - [eqMenu addItem:[NSMenuItem separatorItem]]; - for (i = 0; i < [eqPresets count]; i++) { - NSString *setName = [eqPresets objectAtIndex:i]; + NSString *name; NSMenuItem *tempItem; - if (setName) { - tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""]; - [tempItem setTag:i]; - [eqMenu addItem:tempItem]; - [tempItem release]; + if ( ( name = [eqPresets objectAtIndex:i] ) ) { + tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""]; + [tempItem setTag:i]; + [eqMenu addItem:tempItem]; + [tempItem autorelease]; } } - [eqItem setSubmenu:eqMenu]; - [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState]; + [eqItem setSubmenu:eqMenu]; + [eqItem setEnabled:YES]; + [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState]; } -//Called when the timer fires. -- (void)timerUpdate +- (void)updateRatingMenu { - int playlist = [currentRemote currentPlaylistIndex]; - ITMTRemotePlayerPlayingState playerState = [currentRemote playerPlayingState]; - - if ((playlist > 0) || playerState != ITMTRemotePlayerStopped) { - int trackPlayingIndex = [currentRemote currentSongIndex]; - - if (trackPlayingIndex != lastSongIndex) { - BOOL wasPlayingRadio = isPlayingRadio; - isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist); - - if (isPlayingRadio && !wasPlayingRadio) { - int i; - for (i = 0; i < [playlistMenu numberOfItems]; i++) - { - [[playlistMenu itemAtIndex:i] setState:NSOffState]; - } - } else { - [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; - } - - 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 != lastPlaylistIndex) { - BOOL wasPlayingRadio = isPlayingRadio; - isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist); - - 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]; - } - - if (!isPlayingRadio) { - int i; - for (i = 0; i < [playlistMenu numberOfItems]; i++) - { - [[playlistMenu itemAtIndex:i] setState:NSOffState]; - } - [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; - } - - [self updateMenu]; - lastSongIndex = trackPlayingIndex; - lastPlaylistIndex = playlist; - } - } - //Update Play/Pause menu item - if (playPauseMenuItem){ - if (playerState == ITMTRemotePlayerPlaying) { - [playPauseMenuItem setTitle:@"Pause"]; - } else { - [playPauseMenuItem setTitle:@"Play"]; - } - } - } else if ((lastPlaylistIndex > 0) && (playlist == 0)) { - NSMenuItem *menuItem; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - //Remote the now playing item and add no song item - [menu removeItemAtIndex:trackInfoIndex]; - if ([defaults boolForKey:@"showName"] == YES) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - if ([defaults boolForKey:@"showTime"] == YES) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { - [menu removeItemAtIndex:trackInfoIndex]; + int currentSongRating = ([currentRemote currentSongRating] * 5); + if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) { + if ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist) { + return; } - - if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - [playPauseMenuItem setTitle:@"Play"]; - - didHaveArtistName = NO; - didHaveAlbumName = NO; - lastPlaylistIndex = -1; - lastSongIndex = -1; - - [upcomingSongsItem setSubmenu:nil]; - [upcomingSongsItem setEnabled:NO]; - - [songRatingMenuItem setSubmenu:nil]; - [songRatingMenuItem setEnabled:NO]; - - menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex]; - [menuItem release]; + [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState]; + lastSongRating = currentSongRating; + [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState]; } } -//Updates the menu with current player state, song, and upcoming songs -- (void)updateMenu +- (void)timerUpdate { - NSMenuItem *menuItem; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) { - return; + NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier]; + if (![lastSongIdentifier isEqualToString:currentIdentifier] || + (!isPlayingRadio && ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist))) { + // + // + // If we want to show the new track floater, do it here! + // + // + [self rebuildMenu]; } - if (upcomingSongsItem) { - [self rebuildUpcomingSongsMenu]; - } + [self updateRatingMenu]; - if (playlistItem) { - [self rebuildPlaylistMenu]; - } - - if (eqItem) { - [self rebuildEQPresetsMenu]; - } - if (trackInfoIndex > -1) { - NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; - curSongName = [currentRemote currentSongTitle]; - - if ([defaults boolForKey:@"showAlbum"]) { - curAlbumName = [currentRemote currentSongAlbum]; - } - - if ([defaults boolForKey:@"showArtist"]) { - curArtistName = [currentRemote currentSongArtist]; - } - - if ([curSongName length] > 0) { - int index = [menu indexOfItemWithTitle:@"Now Playing"]; - if (index > -1) { - if ([defaults boolForKey:@"showName"]) { - [menu removeItemAtIndex:index + 1]; - } - if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { - [menu removeItemAtIndex:index + 1]; - } - if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { - [menu removeItemAtIndex:index + 1]; - } - if ([defaults boolForKey:@"showTime"]) { - [menu removeItemAtIndex:index + 1]; - } - } - - if (!isPlayingRadio) { - if ([defaults boolForKey:@"showTime"]) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]] - action:nil - keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - } - - if ([curArtistName length] > 0) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curArtistName] - action:nil - keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - } - - if ([curAlbumName length] > 0) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName] - action:nil - keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - } - - if (songRatingMenuItem) { - int rating = (int)[currentRemote currentSongRating] * 10; - int i; - for (i = 0; i < 5; i++) { - [[ratingMenu itemAtIndex:i] setState:NSOffState]; - [[ratingMenu itemAtIndex:i] setTarget:self]; - } - [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState]; - } - } - - if ([defaults boolForKey:@"showName"]) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] - action:nil - keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - } - - if (index == -1) { - menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""]; - [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]]; - [menu insertItem:menuItem atIndex:trackInfoIndex]; - [menuItem release]; - - [songRatingMenuItem setSubmenu:ratingMenu]; - [songRatingMenuItem setEnabled:YES]; - } - } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) { - [menu removeItemAtIndex:trackInfoIndex]; - - if ([defaults boolForKey:@"showName"] == YES) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - if ([defaults boolForKey:@"showTime"] == YES) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { - [menu removeItemAtIndex:trackInfoIndex]; - } - - menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex]; - [menuItem release]; - } - - if ([defaults boolForKey:@"showArtist"]) { - didHaveArtistName = (([curArtistName length] > 0) ? YES : NO); - } - - if ([defaults boolForKey:@"showAlbum"]) { - didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); + //Update Play/Pause menu item + if (playPauseItem){ + // + // + // If we want to show the song played/paused, show it here! + // + // + if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) { + [playPauseItem setTitle:@"Pause"]; + } else { + [playPauseItem setTitle:@"Play"]; } } - [menu update]; } // @@ -763,16 +544,8 @@ - (void)selectPlaylist:(id)sender { - int playlist = [[sender representedObject] intValue]; - if (!isPlayingRadio) { - int curPlaylist = [currentRemote currentPlaylistIndex]; - if (curPlaylist > 0) { - [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState]; - } - } + int playlist = [sender tag]; [currentRemote switchToPlaylistAtIndex:playlist]; - [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; - [self updateMenu]; } - (void)selectEQPreset:(id)sender @@ -780,21 +553,18 @@ int curSet = [currentRemote currentEQPresetIndex]; int item = [sender tag]; - if (item == -1) { - [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]]; - } else { - [currentRemote setEqualizerEnabled:YES]; - [currentRemote switchToEQAtIndex:item]; - [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState]; - [[eqMenu itemAtIndex:item + 2] setState:NSOnState]; - } + [currentRemote switchToEQAtIndex:item]; + [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState]; + [[eqMenu itemAtIndex:item] setState:NSOnState]; } - (void)selectSongRating:(id)sender { - [[ratingMenu itemAtIndex:([currentRemote currentSongRating] / 20)] setState:NSOffState]; - [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0]; + int newRating = [sender tag]; + [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState]; [sender setState:NSOnState]; + [currentRemote setCurrentSongRating:(float)newRating / 100.0]; + lastSongRating = newRating / 20; } - (void)playPause:(id)sender @@ -803,13 +573,13 @@ if (state == ITMTRemotePlayerPlaying) { [currentRemote pause]; - [playPauseMenuItem setTitle:@"Play"]; + [playPauseItem setTitle:@"Play"]; } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) { [currentRemote pause]; [currentRemote play]; } else { [currentRemote play]; - [playPauseMenuItem setTitle:@"Pause"]; + [playPauseItem setTitle:@"Pause"]; } } @@ -826,13 +596,13 @@ - (void)fastForward:(id)sender { [currentRemote forward]; - [playPauseMenuItem setTitle:@"Play"]; + [playPauseItem setTitle:@"Play"]; } - (void)rewind:(id)sender { [currentRemote rewind]; - [playPauseMenuItem setTitle:@"Play"]; + [playPauseItem setTitle:@"Play"]; } // @@ -855,10 +625,8 @@ - (void)showPreferences:(id)sender { - if (!prefsController) { - prefsController = [[PreferencesController alloc] initWithMenuTunes:self]; - [self clearHotKeys]; - } + [[PreferencesController sharedPrefs] setController:self]; + [[PreferencesController sharedPrefs] showPrefsWindow:self]; } - (void)closePreferences @@ -866,10 +634,12 @@ if ( ( isAppRunning == ITMTRemotePlayerRunning) ) { [self setupHotKeys]; } - [prefsController release]; - prefsController = nil; } +- (ITMTRemote *)currentRemote +{ + return currentRemote; +} // // @@ -884,6 +654,12 @@ [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"]; [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"]; [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"]; } - (void)setupHotKeys @@ -919,6 +695,42 @@ combo:[defaults keyComboForKey:@"UpcomingSongs"] target:self action:@selector(showUpcomingSongs)]; } + + if ([defaults objectForKey:@"ToggleLoop"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" + combo:[defaults keyComboForKey:@"ToggleLoop"] + target:self action:NULL/*Set this to something*/]; + } + + if ([defaults objectForKey:@"ToggleShuffle"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" + combo:[defaults keyComboForKey:@"ToggleShuffle"] + target:self action:NULL/*Set this to something*/]; + } + + if ([defaults objectForKey:@"IncrementVolume"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" + combo:[defaults keyComboForKey:@"IncrementVolume"] + target:self action:NULL/*Set this to something*/]; + } + + if ([defaults objectForKey:@"DecrementVolume"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" + combo:[defaults keyComboForKey:@"DecrementVolume"] + target:self action:NULL/*Set this to something*/]; + } + + if ([defaults objectForKey:@"IncrementRating"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" + combo:[defaults keyComboForKey:@"IncrementRating"] + target:self action:NULL/*Set this to something*/]; + } + + if ([defaults objectForKey:@"DecrementRating"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" + combo:[defaults keyComboForKey:@"DecrementRating"] + target:self action:NULL/*Set this to something*/]; + } } // @@ -970,12 +782,16 @@ } } - [statusWindow setText:stringToShow]; + // + //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow + // + + /*[statusWindow setText:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } @@ -991,7 +807,6 @@ int i; NSString *songs = @""; - statusWindow = [ITTransientStatusWindow sharedWindow]; for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong = [currentRemote songTitleAtIndex:i]; @@ -999,12 +814,17 @@ songs = [songs stringByAppendingString:@"\n"]; } } - [statusWindow setText:songs]; + + // + //SHOW STATUS WINDOW HERE WITH STRING songs + // + + /*[statusWindow setText:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } } @@ -1049,12 +869,17 @@ //Space -- ARGH! case 49: { + // Haven't tested this, though it should work. + unichar buffer; + [[NSString stringWithString:@"Space"] getCharacters:&buffer]; + charcode = buffer; /*MenuRef menuRef = _NSGetCarbonMenu([item menu]); NSLog(@"%@", menuRef); SetMenuItemCommandKey(menuRef, 0, NO, 49); SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier); SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph); charcode = 'b';*/ + } break;