X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/82fb82a83451f2b6420bd6efa2d80f8c1ae7d89a..3c44511cb0f9de3e1698a0a33721f6f140ea2a3a:/MenuController.m?ds=sidebyside diff --git a/MenuController.m b/MenuController.m index 6ae64a3..a7147a4 100755 --- a/MenuController.m +++ b/MenuController.m @@ -21,6 +21,8 @@ - (NSMenu *)upcomingSongsMenu; - (NSMenu *)playlistsMenu; - (NSMenu *)eqMenu; +- (NSMenu *)artistsMenu; +- (NSMenu *)albumsMenu; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers onItem:(id )item; - (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name; @@ -47,13 +49,14 @@ NSEnumerator *itemEnum; ITHotKey *hotKey; NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys]; - int currentSongRating; + ITMTRemote *mtr = [[MainController sharedController] currentRemote]; + int currentSongRating = 0; //Get the information NS_DURING - _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; - _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); - currentSongRating = ( [[[MainController sharedController] currentRemote] currentSongRating] != -1 ); + _currentPlaylist = [mtr currentPlaylistIndex]; + _playingRadio = ([mtr currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + currentSongRating = ( [mtr currentSongRating] != -1 ); NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -81,6 +84,16 @@ [tempItem setSubmenu:nil]; } + if ( (tempItem = [_currentMenu itemWithTag:5]) ) { + ITDebugLog(@"Removing \"Artists\" submenu."); + [tempItem setSubmenu:nil]; + } + + if ( (tempItem = [_currentMenu itemWithTag:6]) ) { + ITDebugLog(@"Removing \"Albums\" submenu."); + [tempItem setSubmenu:nil]; + } + ITDebugLog(@"Begin building menu."); //create our menu @@ -106,7 +119,7 @@ ITDebugLog(@"Set \"Play\"/\"Pause\" menu item's title to correct state."); NS_DURING - switch ([[[MainController sharedController] currentRemote] playerPlayingState]) { + switch ([mtr playerPlayingState]) { case ITMTRemotePlayerPlaying: [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")]; break; @@ -183,7 +196,7 @@ NS_DURING tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), - [[[MainController sharedController] currentRemote] playerSimpleName]] + [mtr playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""]; NS_HANDLER @@ -225,10 +238,10 @@ } else if ([nextObject isEqualToString:@"trackInfo"]) { ITDebugLog(@"Check to see if a Track is playing..."); //Handle playing radio too - if (_currentPlaylist) { - NSString *title; + if (_currentTrack != -1 && _currentPlaylist > 0) { + NSString *title = nil; NS_DURING - title = [[[MainController sharedController] currentRemote] currentSongTitle]; + title = [mtr currentSongTitle]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -244,9 +257,9 @@ if (!_playingRadio) { if ([defaults boolForKey:@"showAlbum"]) { - NSString *curAlbum; + NSString *curAlbum = nil; NS_DURING - curAlbum = [[[MainController sharedController] currentRemote] currentSongAlbum]; + curAlbum = [mtr currentSongAlbum]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -258,9 +271,9 @@ } if ([defaults boolForKey:@"showArtist"]) { - NSString *curArtist; + NSString *curArtist = nil; NS_DURING - curArtist = [[[MainController sharedController] currentRemote] currentSongArtist]; + curArtist = [mtr currentSongArtist]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -272,9 +285,9 @@ } if ([defaults boolForKey:@"showComposer"]) { - NSString *curComposer; + NSString *curComposer = nil; NS_DURING - curComposer = [[[MainController sharedController] currentRemote] currentSongComposer]; + curComposer = [mtr currentSongComposer]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -286,9 +299,9 @@ } if ([defaults boolForKey:@"showTrackNumber"]) { - int track; + int track = 0; NS_DURING - track = [[[MainController sharedController] currentRemote] currentSongTrack]; + track = [mtr currentSongTrack]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -301,9 +314,9 @@ } NS_DURING - if ([defaults boolForKey:@"showTime"] && ( ([[[MainController sharedController] currentRemote] currentSongElapsed] != nil) || ([[[MainController sharedController] currentRemote] currentSongLength] != nil) )) { - ITDebugLog(@"Add Track Elapsed (\"%@/%@\") menu item.", [[[MainController sharedController] currentRemote] currentSongElapsed], [[[MainController sharedController] currentRemote] currentSongLength]); - [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", [[[MainController sharedController] currentRemote] currentSongElapsed], [[[MainController sharedController] currentRemote] currentSongLength]] action:nil keyEquivalent:@""]]; + if ([defaults boolForKey:@"showTime"] && ( ([mtr currentSongElapsed] != nil) || ([mtr currentSongLength] != nil) )) { + ITDebugLog(@"Add Track Elapsed (\"%@/%@\") menu item.", [mtr currentSongElapsed], [mtr currentSongLength]); + [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", [mtr currentSongElapsed], [mtr currentSongLength]] action:nil keyEquivalent:@""]]; } NS_HANDLER [[MainController sharedController] networkError:localException]; @@ -311,9 +324,12 @@ if (!_playingRadio) { NS_DURING - if ([defaults boolForKey:@"showTrackRating"] && ( [[[MainController sharedController] currentRemote] currentSongRating] != -1.0 )) { + if ([defaults boolForKey:@"showPlayCount"] && [mtr currentSource] == ITMTRemoteLibrarySource) { + [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"Play Count: %i", [mtr currentSongPlayCount]] action:nil keyEquivalent:@""]]; + } + if ([defaults boolForKey:@"showTrackRating"] && ( [mtr currentSongRating] != -1.0 )) { NSString *string = nil; - switch ((int)([[[MainController sharedController] currentRemote] currentSongRating] * 5)) { + switch ((int)([mtr currentSongRating] * 5)) { case 0: string = [NSString stringWithUTF8String:"☆☆☆☆☆"]; break; @@ -341,7 +357,7 @@ NS_ENDHANDLER /*if ([tempItem respondsToSelector:@selector(setAttributedTitle:)] && [defaults boolForKey:@"showAlbumArtwork"] && ![[NetworkController sharedController] isConnectedToServer]) { - NSImage *image = [[[MainController sharedController] currentRemote] currentSongAlbumArt]; + NSImage *image = [mtr currentSongAlbumArt]; if (image) { NSSize oldSize, newSize; oldSize = [image size]; @@ -385,43 +401,58 @@ [tempItem setState:NSOffState]; } NS_DURING - [[_eqMenu itemAtIndex:([[[MainController sharedController] currentRemote] currentEQPresetIndex] - 1)] setState:NSOnState]; + [[_eqMenu itemAtIndex:0] setState:[mtr equalizerEnabled] ? NSOnState : NSOffState]; + [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] + 1)] setState:NSOnState]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER } else if ([nextObject isEqualToString:@"songRating"] && currentSongRating) { - ITDebugLog(@"Add \"Song Rating\" submenu."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"songRating", @"Song Rating") - action:nil - keyEquivalent:@""]; - [tempItem setSubmenu:_ratingMenu]; - [tempItem setTag:1]; - if (_playingRadio || !_currentPlaylist) { - [tempItem setEnabled:NO]; - } - - itemEnum = [[_ratingMenu itemArray] objectEnumerator]; - while ( (tempItem = [itemEnum nextObject]) ) { - [tempItem setState:NSOffState]; - } - - NS_DURING - [[_ratingMenu itemAtIndex:([[[MainController sharedController] currentRemote] currentSongRating] * 5)] setState:NSOnState]; - NS_HANDLER - [[MainController sharedController] networkError:localException]; - NS_ENDHANDLER - } else if ([nextObject isEqualToString:@"upcomingSongs"]) { - ITDebugLog(@"Add \"Upcoming Songs\" submenu."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs") - action:nil - keyEquivalent:@""]; - [tempItem setSubmenu:_upcomingSongsMenu]; - [tempItem setTag:2]; - if (_playingRadio || !_currentPlaylist) { - [tempItem setEnabled:NO]; - } + ITDebugLog(@"Add \"Song Rating\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"songRating", @"Song Rating") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_ratingMenu]; + [tempItem setTag:1]; + if (_playingRadio || !_currentPlaylist) { + [tempItem setEnabled:NO]; + } + + itemEnum = [[_ratingMenu itemArray] objectEnumerator]; + while ( (tempItem = [itemEnum nextObject]) ) { + [tempItem setState:NSOffState]; } + + NS_DURING + [[_ratingMenu itemAtIndex:([mtr currentSongRating] * 5)] setState:NSOnState]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + } else if ([nextObject isEqualToString:@"upcomingSongs"]) { + ITDebugLog(@"Add \"Upcoming Songs\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_upcomingSongsMenu]; + [tempItem setTag:2]; + if (_playingRadio || !_currentPlaylist) { + [tempItem setEnabled:NO]; + } + } else if ([nextObject isEqualToString:@"artists"]) { + ITDebugLog(@"Add \"Artists\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"artists", @"Artists") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_artistsMenu]; + [tempItem setTag:5]; + } else if ([nextObject isEqualToString:@"albums"]) { + ITDebugLog(@"Add \"Albums\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"albums", @"Albums") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_albumsMenu]; + [tempItem setTag:6]; } + } ITDebugLog(@"Finished building menu."); [_currentMenu release]; _currentMenu = menu; @@ -431,7 +462,7 @@ - (NSMenu *)menuForNoPlayer { NSMenu *menu = [[NSMenu alloc] initWithTitle:@""]; - id tempItem; + id tempItem = nil; ITDebugLog(@"Creating menu for when player isn't running."); NS_DURING ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]); @@ -460,30 +491,61 @@ return [menu autorelease]; } -- (void)rebuildSubmenus +- (BOOL)rebuildSubmenus { + NSArray *menu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"]; ITDebugLog(@"Rebuilding all of the submenus."); NS_DURING - _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; - _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex]; + _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex]; + if (_currentTrack > -1) { + _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; + } _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER ITDebugLog(@"Releasing old submenus."); + _continue = YES; + ITDebugLog(@" - Rating menu"); [_ratingMenu release]; + _ratingMenu = nil; + ITDebugLog(@" - Upcoming songs menu"); [_upcomingSongsMenu release]; + _upcomingSongsMenu = nil; + ITDebugLog(@" - Playlists menu"); [_playlistsMenu release]; + _playlistsMenu = nil; + ITDebugLog(@" - EQ menu"); [_eqMenu release]; + _eqMenu = nil; + ITDebugLog(@"Beginning Rebuild of \"Song Rating\" submenu."); _ratingMenu = [self ratingMenu]; ITDebugLog(@"Beginning Rebuild of \"Upcoming Songs\" submenu."); _upcomingSongsMenu = [self upcomingSongsMenu]; - ITDebugLog(@"Beginning Rebuild of \"Playlists\" submenu."); - _playlistsMenu = [self playlistsMenu]; - ITDebugLog(@"Beginning Rebuild of \"EQ Presets\" submenu."); - _eqMenu = [self eqMenu]; + if (_continue) { + ITDebugLog(@"Beginning Rebuild of \"Playlists\" submenu."); + _playlistsMenu = [self playlistsMenu]; + } + if (_continue) { + ITDebugLog(@"Beginning Rebuild of \"EQ Presets\" submenu."); + _eqMenu = [self eqMenu]; + } + if (_continue && [menu containsObject:@"artists"]) { + ITDebugLog(@"Releasing artists menu"); + [_artistsMenu release]; + ITDebugLog(@"Beginning Rebuild of \"Artists\" submenu."); + _artistsMenu = [self artistsMenu]; + } + + if (_continue && [menu containsObject:@"albums"]) { + ITDebugLog(@"Releasing albums menu"); + [_albumsMenu release]; + ITDebugLog(@"Beginning Rebuild of \"Albums\" submenu."); + _albumsMenu = [self albumsMenu]; + } ITDebugLog(@"Done rebuilding all of the submenus."); + return _continue; } - (NSMenu *)ratingMenu @@ -517,22 +579,29 @@ - (NSMenu *)upcomingSongsMenu { - NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; - int numSongs, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; - + NSMenu *upcomingSongsMenu; + int numSongs = 0, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; + if (_currentTrack == -1) { + return nil; + } NS_DURING numSongs = [[[MainController sharedController] currentRemote] numberOfSongsInPlaylistAtIndex:_currentPlaylist]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER + if (numSongs == -1) { + return nil; + } + upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; + NS_DURING ITDebugLog(@"Building \"Upcoming Songs\" menu."); if (_currentPlaylist && !_playingRadio) { if (numSongs > 0) { int i; for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) { if (i <= numSongs) { - NSString *curSong; + NSString *curSong = nil; NS_DURING curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i]; NS_HANDLER @@ -554,7 +623,12 @@ } } ITDebugLog(@"Done Building \"Upcoming Songs\" menu."); - return upcomingSongsMenu; + NS_VALUERETURN(upcomingSongsMenu, NSMenu *); + NS_HANDLER + [upcomingSongsMenu release]; + _continue = NO; + NS_VALUERETURN(nil, NSMenu *); + NS_ENDHANDLER } /*- (NSMenu *)playlistsMenu @@ -601,7 +675,7 @@ - (NSMenu *)playlistsMenu { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; - NSArray *playlists; + NSArray *playlists = nil; id tempItem; ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; int i, j; @@ -611,6 +685,12 @@ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER + + if (!playlists) { + [playlistsMenu release]; + return nil; + } + NS_DURING ITDebugLog(@"Building \"Playlists\" menu."); { NSArray *curPlaylist = [playlists objectAtIndex:0]; @@ -625,6 +705,7 @@ ITDebugLog(@"Adding index to the index array."); [indices addObject:[curPlaylist objectAtIndex:2]]; } + if ([playlists count] > 1) { if ([[[playlists objectAtIndex:1] objectAtIndex:1] intValue] == ITMTRemoteRadioSource) { [indices addObject:[[playlists objectAtIndex:1] objectAtIndex:2]]; @@ -636,7 +717,7 @@ [playlistsMenu addItem:[NSMenuItem separatorItem]]; } } - + if ([playlists count] > 1) { for (i = 1; i < [playlists count]; i++) { NSArray *curPlaylist = [playlists objectAtIndex:i]; @@ -663,22 +744,35 @@ } } ITDebugLog(@"Checking the current source."); - if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ) { - tempItem = [playlistsMenu itemAtIndex:[playlistsMenu numberOfItems] + [indices indexOfObject:[NSNumber numberWithInt:[[[MainController sharedController] currentRemote] currentSourceIndex]]] - [indices count]]; - [tempItem setState:NSOnState]; - [[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; - } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) { - [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; - } + NS_DURING + if (_currentPlaylist != -1) { + if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ) { + tempItem = [playlistsMenu itemAtIndex:[playlistsMenu numberOfItems] + [indices indexOfObject:[NSNumber numberWithInt:[[[MainController sharedController] currentRemote] currentSourceIndex]]] - [indices count]]; + [tempItem setState:NSOnState]; + [[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; + } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) { + [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; + } + } + NS_HANDLER + NS_ENDHANDLER [indices release]; + tempItem = [playlistsMenu addItemWithTitle:NSLocalizedString(@"refresh", @"Refresh") action:@selector(rebuildSubmenus) keyEquivalent:@""]; + [tempItem setTarget:self]; + [tempItem setImage:[NSImage imageNamed:@"ChasingArrow"]]; ITDebugLog(@"Done Building \"Playlists\" menu"); - return playlistsMenu; + NS_VALUERETURN(playlistsMenu, NSMenu *); + NS_HANDLER + [playlistsMenu release]; + _continue = NO; + NS_VALUERETURN(nil, NSMenu *); + NS_ENDHANDLER } - (NSMenu *)eqMenu { NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""]; - NSArray *eqPresets; + NSArray *eqPresets = nil; id tempItem; int i; @@ -690,6 +784,11 @@ ITDebugLog(@"Building \"EQ Presets\" menu."); + tempItem = [eqMenu addItemWithTitle:@"Enabled" action:@selector(performEqualizerMenuAction:) keyEquivalent:@""]; + [tempItem setTag:-1]; + [tempItem setTarget:self]; + [eqMenu addItem:[NSMenuItem separatorItem]]; + for (i = 0; i < [eqPresets count]; i++) { NSString *name; if ( ( name = [eqPresets objectAtIndex:i] ) ) { @@ -705,6 +804,46 @@ return eqMenu; } +- (NSMenu *)artistsMenu +{ + NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@"Artists"]; + NSEnumerator *artistsEnumerator; + NSString *nextArtist; + id tempItem; + ITDebugLog(@"Building \"Artists\" menu."); + NS_DURING + artistsEnumerator = [[[[MainController sharedController] currentRemote] artists] objectEnumerator]; + while ( (nextArtist = [artistsEnumerator nextObject]) ) { + tempItem = [artistsMenu addItemWithTitle:nextArtist action:@selector(performBrowseMenuAction:) keyEquivalent:@""]; + [tempItem setTarget:self]; + } + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Done Building \"Artists\" menu"); + return artistsMenu; +} + +- (NSMenu *)albumsMenu +{ + NSMenu *albumsMenu = [[NSMenu alloc] initWithTitle:@"Albums"]; + NSEnumerator *albumsEnumerator; + NSString *nextAlbum; + id tempItem; + ITDebugLog(@"Building \"Albums\" menu."); + NS_DURING + albumsEnumerator = [[[[MainController sharedController] currentRemote] albums] objectEnumerator]; + while ( (nextAlbum = [albumsEnumerator nextObject]) ) { + tempItem = [albumsMenu addItemWithTitle:nextAlbum action:@selector(performBrowseMenuAction:) keyEquivalent:@""]; + [tempItem setTarget:self]; + } + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Done Building \"Albums\" menu"); + return albumsMenu; +} + - (void)performMainMenuAction:(id)sender { switch ( [sender tag] ) @@ -775,6 +914,17 @@ [[MainController sharedController] selectSongAtIndex:[sender tag]]; } +- (void)performBrowseMenuAction:(id)sender +{ + ITDebugLog(@"Browse action selected on item named %@", [sender title]); + /* + ** 1 - Artist + ** 2 - Album + ** 3 - Genre? + */ + [[MainController sharedController] makePlaylistWithTerm:[sender title] ofType:(([[[sender menu] title] isEqualToString:@"Artists"]) ? 1 : 2)]; +} + - (void)updateMenu { ITDebugLog(@"Update Menu");