- (NSMenu *)upcomingSongsMenu;
- (NSMenu *)playlistsMenu;
- (NSMenu *)eqMenu;
+- (NSMenu *)artistsMenu;
+- (NSMenu *)albumsMenu;
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
onItem:(id <NSMenuItem>)item;
- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name;
[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
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
} 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:([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];
- }
+ 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;
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
- (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) {
}
}
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
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];
}
}
ITDebugLog(@"Checking the current source.");
+ NS_DURING
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];
} else if (source == ITMTRemoteLibrarySource && _currentPlaylist) {
[[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
}
+ NS_HANDLER
+ NS_ENDHANDLER
[indices release];
- [playlistsMenu addItem:[NSMenuItem separatorItem]];
- [[playlistsMenu addItemWithTitle:NSLocalizedString(@"refresh", @"Refresh") action:@selector(rebuildSubmenus) keyEquivalent:@""] setTarget:self];
+ 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
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++) {
return eqMenu;
}
+- (NSMenu *)artistsMenu
+{
+ NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@"Artists"];
+ NSEnumerator *artistsEnumerator;
+ NSString *nextArtist;
+ id <NSMenuItem> 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 <NSMenuItem> 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] )
[[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");
git.ithinksw.org / MenuTunes.git / blobdiff