X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/b5111a52983c34e3d63dd8547a1f259a7cb5edda..85e567aca046a76da589f1cdb3fe22354efdd187:/MenuController.m diff --git a/MenuController.m b/MenuController.m index c207e66..e0721a4 100755 --- a/MenuController.m +++ b/MenuController.m @@ -22,6 +22,7 @@ - (NSMenu *)playlistsMenu; - (NSMenu *)eqMenu; - (NSMenu *)artistsMenu; +- (NSMenu *)albumsMenu; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers onItem:(id )item; - (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name; @@ -88,6 +89,11 @@ [tempItem setSubmenu:nil]; } + if ( (tempItem = [_currentMenu itemWithTag:6]) ) { + ITDebugLog(@"Removing \"Albums\" submenu."); + [tempItem setSubmenu:nil]; + } + ITDebugLog(@"Begin building menu."); //create our menu @@ -232,7 +238,7 @@ } else if ([nextObject isEqualToString:@"trackInfo"]) { ITDebugLog(@"Check to see if a Track is playing..."); //Handle playing radio too - if (_currentPlaylist) { + if (_currentTrack != -1 && _currentPlaylist > 1) { NSString *title = nil; NS_DURING title = [mtr currentSongTitle]; @@ -397,7 +403,6 @@ NS_DURING [[_eqMenu itemAtIndex:0] setState:[mtr equalizerEnabled] ? NSOnState : NSOffState]; [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] + 1)] setState:NSOnState]; - [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] - 1)] setState:NSOnState]; NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -439,11 +444,13 @@ keyEquivalent:@""]; [tempItem setSubmenu:_artistsMenu]; [tempItem setTag:5]; - - itemEnum = [[_eqMenu itemArray] objectEnumerator]; - while ( (tempItem = [itemEnum nextObject]) ) { - [tempItem setState:NSOffState]; - } + } 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."); @@ -484,43 +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 ([menu containsObject:@"artists"]) { + 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 @@ -554,15 +579,22 @@ - (NSMenu *)upcomingSongsMenu { - NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; + 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) { @@ -591,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 @@ -648,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]; @@ -662,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]]; @@ -673,7 +717,7 @@ [playlistsMenu addItem:[NSMenuItem separatorItem]]; } } - + if ([playlists count] > 1) { for (i = 1; i < [playlists count]; i++) { NSArray *curPlaylist = [playlists objectAtIndex:i]; @@ -700,19 +744,29 @@ } } 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 @@ -733,11 +787,6 @@ tempItem = [eqMenu addItemWithTitle:@"Enabled" action:@selector(performEqualizerMenuAction:) keyEquivalent:@""]; [tempItem setTag:-1]; [tempItem setTarget:self]; - NS_DURING - [tempItem setState:[[[MainController sharedController] currentRemote] equalizerEnabled] ? NSOnState : NSOffState]; - NS_HANDLER - [[MainController sharedController] networkError:localException]; - NS_ENDHANDLER [eqMenu addItem:[NSMenuItem separatorItem]]; for (i = 0; i < [eqPresets count]; i++) { @@ -757,7 +806,7 @@ - (NSMenu *)artistsMenu { - NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@""]; + NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@"Artists"]; NSEnumerator *artistsEnumerator; NSString *nextArtist; id tempItem; @@ -765,8 +814,7 @@ NS_DURING artistsEnumerator = [[[[MainController sharedController] currentRemote] artists] objectEnumerator]; while ( (nextArtist = [artistsEnumerator nextObject]) ) { - tempItem = [artistsMenu addItemWithTitle:nextArtist action:@selector(performArtistsMenuAction:) keyEquivalent:@""]; - [tempItem setRepresentedObject:nextArtist]; + tempItem = [artistsMenu addItemWithTitle:nextArtist action:@selector(performBrowseMenuAction:) keyEquivalent:@""]; [tempItem setTarget:self]; } NS_HANDLER @@ -776,6 +824,26 @@ 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] ) @@ -846,15 +914,15 @@ [[MainController sharedController] selectSongAtIndex:[sender tag]]; } -- (void)performArtistsMenuAction:(id)sender +- (void)performBrowseMenuAction:(id)sender { - ITDebugLog(@"Artist action selected on item with object %i", [sender representedObject]); + ITDebugLog(@"Browse action selected on item named %@", [sender title]); /* ** 1 - Artist ** 2 - Album ** 3 - Genre? */ - //[[MainController sharedController] createAndPlayPlaylistWithTerm:[sender representedObject] ofType:1]; + [[MainController sharedController] makePlaylistWithTerm:[sender title] ofType:(([[[sender menu] title] isEqualToString:@"Artists"]) ? 1 : 2)]; } - (void)updateMenu