X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/a876619d0c610eaee6aa5e1a105106f265b2c084..HEAD:/MenuController.m diff --git a/MenuController.m b/MenuController.m index 7c618f5..6778abb 100755 --- a/MenuController.m +++ b/MenuController.m @@ -1,15 +1,8 @@ -// -// MenuController.m -// MenuTunes -// -// Created by Joseph Spiros on Wed Apr 30 2003. -// Copyright (c) 2003 iThink Software. All rights reserved. -// - #import "MenuController.h" #import "MainController.h" #import "NetworkController.h" #import "ITMTRemote.h" +#import "PlaylistNode.h" #import #import #import @@ -24,6 +17,7 @@ - (NSMenu *)eqMenu; - (NSMenu *)artistsMenu; - (NSMenu *)albumsMenu; +- (void)playlistsMenuAux:(NSMenu *)menu node:(PlaylistNode *)node tagPrefix:(int)p; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers onItem:(id )item; - (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name; @@ -61,7 +55,7 @@ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER - + ITDebugLog(@"Reset menu if required."); //Kill the old submenu items @@ -231,12 +225,6 @@ [tempItem setTag:MTMenuAboutItem]; [tempItem setTarget:self]; } else if ([nextObject isEqualToString:@"quit"]) { - if ([[MainController sharedController] blingBling] == NO) { - ITDebugLog(@"Add \"Register MenuTunes...\" menu item."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"register", @"Register MenuTunes...") action:@selector(performMainMenuAction:) keyEquivalent:@""]; - [tempItem setTag:MTMenuRegisterItem]; - [tempItem setTarget:self]; - } ITDebugLog(@"Add \"Quit\" menu item."); tempItem = [menu addItemWithTitle:NSLocalizedString(@"quit", @"Quit") action:@selector(performMainMenuAction:) @@ -442,7 +430,7 @@ keyEquivalent:@""]; [tempItem setSubmenu:_upcomingSongsMenu]; [tempItem setTag:2]; - if (_playingRadio || !_currentPlaylist) { + if (_playingRadio || _currentPlaylist < 1) { [tempItem setEnabled:NO]; } } else if ([nextObject isEqualToString:@"artists"]) { @@ -486,12 +474,6 @@ tempItem = [menu addItemWithTitle:NSLocalizedString(@"preferences", @"Preferences...") action:@selector(performMainMenuAction:) keyEquivalent:@""]; [tempItem setTag:MTMenuPreferencesItem]; [tempItem setTarget:self]; - if ([[MainController sharedController] blingBling] == NO) { - ITDebugLog(@"Add \"Register MenuTunes...\" menu item."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"register", @"Register MenuTunes...") action:@selector(performMainMenuAction:) keyEquivalent:@""]; - [tempItem setTag:MTMenuRegisterItem]; - [tempItem setTarget:self]; - } ITDebugLog(@"Add \"Quit\" menu item."); tempItem = [menu addItemWithTitle:NSLocalizedString(@"quit", @"Quit") action:@selector(performMainMenuAction:) keyEquivalent:@""]; [tempItem setTag:MTMenuQuitItem]; @@ -607,8 +589,17 @@ if (_currentPlaylist && !_playingRadio) { if (numSongs > 0) { int i; - for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) { - if (i <= numSongs) { + for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance && i <= numSongs; i++) { + BOOL enabled = YES; + + //Check if the song at this index is enabled for playback. If it isn't, skip over it + NS_DURING + enabled = [[[MainController sharedController] currentRemote] songEnabledAtIndex:i]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + + if (enabled) { NSString *curSong = nil; NS_DURING curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i]; @@ -621,8 +612,8 @@ [songItem setTag:i]; [songItem setTarget:self]; } else { - break; - } + numSongsInAdvance++; + } } } @@ -679,6 +670,36 @@ return playlistsMenu; }*/ +- (void)playlistsMenuAux:(NSMenu *)menu node:(PlaylistNode *)node tagPrefix:(int)p +{ + id tempItem; + int i; + + for (i = 0; i < [[node children] count]; i++) { + PlaylistNode *nextNode = [[node children] objectAtIndex:i]; + if ([nextNode type] == ITMTFolderNode) { + NSMenu *submenu = [[NSMenu alloc] init]; + tempItem = [menu addItemWithTitle:[nextNode name] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; + [tempItem setTag:p + [nextNode index] + 1]; + [tempItem setTarget:self]; + [tempItem setSubmenu:submenu]; + [self playlistsMenuAux:[submenu autorelease] node:nextNode tagPrefix:p]; + } else { + tempItem = [menu addItemWithTitle:[nextNode name] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; + [tempItem setTag:p + [nextNode index] + 1]; + [tempItem setTarget:self]; + } + + PlaylistNode *root = node; + while ([root type] == ITMTPlaylistNode || [root type] == ITMTFolderNode) { + root = [root parent]; + } + + if ([root index] == [[[MainController sharedController] currentRemote] currentSourceIndex] && [nextNode index] == _currentPlaylist) { + [tempItem setState:NSOnState]; + } + } +} - (NSMenu *)playlistsMenu { @@ -686,7 +707,7 @@ NSArray *playlists = nil; id tempItem; ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; - int i, j; + int i; NSMutableArray *indices = [[NSMutableArray alloc] init]; NS_DURING playlists = [[[MainController sharedController] currentRemote] playlists]; @@ -701,65 +722,52 @@ NS_DURING ITDebugLog(@"Building \"Playlists\" menu."); { - NSArray *curPlaylist = [playlists objectAtIndex:0]; - NSString *name = [curPlaylist objectAtIndex:0]; - ITDebugLog(@"Adding main source: %@", name); - for (i = 3; i < [curPlaylist count]; i++) { - ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:i]); - tempItem = [playlistsMenu addItemWithTitle:[curPlaylist objectAtIndex:i] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; - [tempItem setTag:i - 1]; - [tempItem setTarget:self]; - } + //First we add the main Library source, since it is guaranteed to be there. + PlaylistNode *library = [playlists objectAtIndex:0]; + ITDebugLog(@"Adding main source: %@", [library name]); + [self playlistsMenuAux:playlistsMenu node:library tagPrefix:0]; ITDebugLog(@"Adding index to the index array."); - [indices addObject:[curPlaylist objectAtIndex:2]]; + [indices addObject:[NSNumber numberWithInt:[library index]]]; } + //Next go through the other sources if ([playlists count] > 1) { - if ([[[playlists objectAtIndex:1] objectAtIndex:1] intValue] == ITMTRemoteRadioSource) { - [indices addObject:[[playlists objectAtIndex:1] objectAtIndex:2]]; + //Add the radio source if it is playing + if ([[playlists objectAtIndex:1] sourceType] == ITMTRemoteRadioSource) { + [indices addObject:[NSNumber numberWithInt:[[playlists objectAtIndex:1] index]]]; if (source == ITMTRemoteRadioSource) { [playlistsMenu addItem:[NSMenuItem separatorItem]]; [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState]; - } - } else { - [playlistsMenu addItem:[NSMenuItem separatorItem]]; + } else if ([playlists count] > 2) { + [playlistsMenu addItem:[NSMenuItem separatorItem]]; + } } - } - - if ([playlists count] > 1) { - for (i = 1; i < [playlists count]; i++) { - NSArray *curPlaylist = [playlists objectAtIndex:i]; - if ([[curPlaylist objectAtIndex:1] intValue] != ITMTRemoteRadioSource) { - NSString *name = [curPlaylist objectAtIndex:0]; - NSMenu *submenu = [[NSMenu alloc] init]; + + //Add other sources as needed (shared music, iPods, CDs) + for (i = [playlists count] - 1; i > 1 ; i--) { + PlaylistNode *nextSource = [playlists objectAtIndex:i]; + if ([nextSource type] != ITMTRemoteRadioSource) { + NSString *name = [nextSource name]; ITDebugLog(@"Adding source: %@", name); - if ( ([[curPlaylist objectAtIndex:1] intValue] == ITMTRemoteiPodSource) && [self iPodWithNameAutomaticallyUpdates:name] ) { + if ( ([nextSource type] == ITMTRemoteiPodSource) && [self iPodWithNameAutomaticallyUpdates:name] ) { ITDebugLog(@"Invalid iPod source."); [playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""]; } else { - for (j = 3; j < [curPlaylist count]; j++) { - ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:j]); - tempItem = [submenu addItemWithTitle:[curPlaylist objectAtIndex:j] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; - [tempItem setTag:(i * 1000) + j - 1]; - [tempItem setTarget:self]; - } - [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[submenu autorelease]]; + NSMenu *menu = [[NSMenu alloc] init]; + [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[menu autorelease]]; + [self playlistsMenuAux:menu node:nextSource tagPrefix:(i * 1000)]; } ITDebugLog(@"Adding index to the index array."); - [indices addObject:[curPlaylist objectAtIndex:2]]; + [indices addObject:[NSNumber numberWithInt:[nextSource index]]]; } } } - ITDebugLog(@"Checking the current source."); 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 @@ -892,10 +900,6 @@ ITDebugLog(@"Performing Menu Action: Quit"); [[MainController sharedController] quitMenuTunes]; break; - case MTMenuRegisterItem: - ITDebugLog(@"Performing Menu Action: Register"); - [[MainController sharedController] blingNow]; - break; default: ITDebugLog(@"Performing Menu Action: Unimplemented Menu Item OR Child-bearing Menu Item"); break;