X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/5b0ebb88485736909eeb1072739ad42af1529cd7..2413c9c1fe8cd8d9b4d0487d6354568a02727d7f:/OldMainController.m?ds=inline diff --git a/OldMainController.m b/OldMainController.m index 13063de..6ac5ab4 100755 --- a/OldMainController.m +++ b/OldMainController.m @@ -132,14 +132,23 @@ - (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]; [self setupHotKeys]; + [self rebuildMenu]; isAppRunning = ITMTRemotePlayerRunning; - return; } - - isAppRunning = ITMTRemotePlayerRunning; } - (void)applicationTerminated:(NSNotification *)note @@ -157,6 +166,8 @@ [self clearHotKeys]; isAppRunning = ITMTRemotePlayerNotRunning; + [ratingMenu release]; + [statusItem setMenu:[notRunningMenu autorelease]]; } } @@ -193,22 +204,19 @@ trackInfoIndex = -1; lastPlaylistIndex = -1; - didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0); - didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0); [menu release]; menu = [[NSMenu alloc] initWithTitle:@""]; playPauseItem = nil; - lastSongIdentifier = @"0-0"; upcomingSongsItem = nil; [upcomingSongsMenu release]; upcomingSongsMenu = nil; - ratingItem = nil; - [ratingMenu release]; - ratingMenu = nil; + if (ratingItem) { + [ratingItem setSubmenu:nil]; + } playlistItem = nil; [playlistMenu release]; @@ -218,6 +226,7 @@ [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"]) { @@ -269,6 +278,9 @@ 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 @@ -291,36 +303,9 @@ 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; - ratingItem = [menu addItemWithTitle:@"Song Rating" action:nil keyEquivalent:@""]; - - 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]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:60]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:80]; - - item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""]; - [item setTag:100]; - [ratingItem setSubmenu:ratingMenu]; } else if ([item isEqualToString:@""]) { [menu addItem:[NSMenuItem separatorItem]]; @@ -357,12 +342,14 @@ lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain]; //If we're in a playlist or radio mode - if ( (trackInfoIndex > -1) && (playlist || isPlayingRadio) ) { + if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) { NSString *title; - if ( (i = [menu indexOfItemWithTitle:@"No Song"]) && (i > -1) ) { - [menu removeItemAtIndex:i]; - [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i]; + if ( (i = [menu indexOfItemWithTitle:@"No Song"]) ) { + if ( (i > -1) ) { + [menu removeItemAtIndex:i]; + [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i]; + } } title = [currentRemote currentSongTitle]; @@ -376,22 +363,31 @@ } } + 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]; + } + } + if ([defaults boolForKey:@"showArtist"]) { NSString *artist = [currentRemote currentSongArtist]; - if ([artist length] > 0) { [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; } - - didHaveArtistName = (([artist length] > 0) ? YES : NO); + } + + 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]; + } } if ([defaults boolForKey:@"showAlbum"]) { NSString *album = [currentRemote currentSongAlbum]; - if ([album length] > 0) { [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; - didHaveAlbumName = (([album length]) ? YES : NO); } } } @@ -471,37 +467,25 @@ - (void)rebuildEQPresetsMenu { NSArray *eqPresets = [currentRemote eqPresets]; - NSMenuItem *enabledItem; int i; - [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 *name = [eqPresets objectAtIndex:i]; + NSString *name; NSMenuItem *tempItem; - if (name) { + if ( ( name = [eqPresets objectAtIndex:i] ) ) { tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""]; [tempItem setTag:i]; [eqMenu addItem:tempItem]; - [tempItem release]; + [tempItem autorelease]; } } + [eqItem setSubmenu:eqMenu]; [eqItem setEnabled:YES]; - - [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState]; + [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState]; } - (void)updateRatingMenu @@ -522,6 +506,11 @@ 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]; } @@ -529,6 +518,11 @@ //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 { @@ -559,14 +553,9 @@ 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 @@ -665,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 @@ -700,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*/]; + } } // @@ -838,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;