X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/dde16144878c81f06c7da19d7d4432ccd397f3e0..93a60b6d98f84d592631266e1ee0caabe3642551:/MenuController.m?ds=inline diff --git a/MenuController.m b/MenuController.m index 332e7f8..7c418be 100755 --- a/MenuController.m +++ b/MenuController.m @@ -8,19 +8,27 @@ #import "MenuController.h" #import "MainController.h" +#import "NetworkController.h" +#import "ITMTRemote.h" +#import "PlaylistNode.h" #import #import #import #import #import +#import @interface MenuController (SubmenuMethods) - (NSMenu *)ratingMenu; - (NSMenu *)upcomingSongsMenu; - (NSMenu *)playlistsMenu; - (NSMenu *)eqMenu; +- (NSMenu *)artistsMenu; +- (NSMenu *)albumsMenu; +- (void)playlistsMenuAux:(NSMenu *)menu node:(PlaylistNode *)node tagPrefix:(int)p; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers - onItem:(NSMenuItem *)item; + onItem:(id )item; +- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name; @end @implementation MenuController @@ -40,14 +48,21 @@ NSArray *menuArray = [defaults arrayForKey:@"menu"]; NSEnumerator *enumerator = [menuArray objectEnumerator]; NSString *nextObject; - NSMenuItem *tempItem; + id tempItem; NSEnumerator *itemEnum; ITHotKey *hotKey; NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys]; + ITMTRemote *mtr = [[MainController sharedController] currentRemote]; + int currentSongRating = 0; //Get the information - _currentPlaylist = [currentRemote currentPlaylistIndex]; - _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + NS_DURING + _currentPlaylist = [mtr currentPlaylistIndex]; + _playingRadio = ([mtr currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + currentSongRating = ( [mtr currentSongRating] != -1 ); + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER ITDebugLog(@"Reset menu if required."); @@ -63,12 +78,22 @@ } if ( (tempItem = [_currentMenu itemWithTag:3]) ) { - ITDebugLog(@"Removing \"EQ Presets\" submenu."); + ITDebugLog(@"Removing \"Playlists\" submenu."); [tempItem setSubmenu:nil]; } if ( (tempItem = [_currentMenu itemWithTag:4]) ) { - ITDebugLog(@"Removing \"Playlists\" submenu."); + ITDebugLog(@"Removing \"EQ Presets\" submenu."); + [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]; } @@ -96,17 +121,21 @@ } ITDebugLog(@"Set \"Play\"/\"Pause\" menu item's title to correct state."); - switch ([currentRemote playerPlayingState]) { - case ITMTRemotePlayerPlaying: - [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")]; - break; - case ITMTRemotePlayerRewinding: - case ITMTRemotePlayerForwarding: - [tempItem setTitle:NSLocalizedString(@"resume", @"Resume")]; - break; - default: - break; - } + NS_DURING + switch ([mtr playerPlayingState]) { + case ITMTRemotePlayerPlaying: + [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")]; + break; + case ITMTRemotePlayerRewinding: + case ITMTRemotePlayerForwarding: + [tempItem setTitle:NSLocalizedString(@"resume", @"Resume")]; + break; + default: + break; + } + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER } else if ([nextObject isEqualToString:@"nextTrack"]) { ITDebugLog(@"Add \"Next Track\" menu item."); tempItem = [menu addItemWithTitle:NSLocalizedString(@"nextTrack", @"Next Track") @@ -167,11 +196,15 @@ } } else if ([nextObject isEqualToString:@"showPlayer"]) { ITDebugLog(@"Add \"Show Player\" menu item."); - tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", - NSLocalizedString(@"show", @"Show"), - [[[MainController sharedController] currentRemote] playerSimpleName]] - action:@selector(performMainMenuAction:) - keyEquivalent:@""]; + NS_DURING + tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", + NSLocalizedString(@"show", @"Show"), + [mtr playerSimpleName]] + action:@selector(performMainMenuAction:) + keyEquivalent:@""]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER itemEnum = [hotKeys objectEnumerator]; while ( (hotKey = [itemEnum nextObject]) ) { @@ -192,7 +225,20 @@ keyEquivalent:@""]; [tempItem setTag:MTMenuPreferencesItem]; [tempItem setTarget:self]; - } else if ([nextObject isEqualToString:@"quit"]) { + } else if ([nextObject isEqualToString:@"about"]) { + ITDebugLog(@"Add \"About MenuTunes...\" menu item."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"about", @"About MenuTunes...") + action:@selector(performMainMenuAction:) + keyEquivalent:@""]; + [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:) @@ -202,9 +248,13 @@ } else if ([nextObject isEqualToString:@"trackInfo"]) { ITDebugLog(@"Check to see if a Track is playing..."); //Handle playing radio too - if (_currentPlaylist) { - NSString *title = [currentRemote currentSongTitle]; - + if (_currentTrack != -1 && _currentPlaylist > 0) { + NSString *title = nil; + NS_DURING + title = [mtr currentSongTitle]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER ITDebugLog(@"A Track is Playing, Add \"Track Info\" menu items."); ITDebugLog(@"Add \"Now Playing\" menu item."); [menu addItemWithTitle:NSLocalizedString(@"nowPlaying", @"Now Playing") action:NULL keyEquivalent:@""]; @@ -215,64 +265,123 @@ [menu addItemWithTitle:title action:nil keyEquivalent:@""]]; } - if ([defaults boolForKey:@"showAlbum"]) { - NSString *curAlbum = [currentRemote currentSongAlbum]; - ITDebugLog(@"Add Track Album (\"%@\") menu item.", curAlbum); - if ([curAlbum length]) { - [menu indentItem: - [menu addItemWithTitle:curAlbum action:nil keyEquivalent:@""]]; + if (!_playingRadio) { + if ([defaults boolForKey:@"showAlbum"]) { + NSString *curAlbum = nil; + NS_DURING + curAlbum = [mtr currentSongAlbum]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Add Track Album (\"%@\") menu item.", curAlbum); + if ( curAlbum ) { + [menu indentItem: + [menu addItemWithTitle:curAlbum action:nil keyEquivalent:@""]]; + } } - } - - if ([defaults boolForKey:@"showArtist"]) { - NSString *curArtist = [currentRemote currentSongArtist]; - ITDebugLog(@"Add Track Artist (\"%@\") menu item.", curArtist); - if ([curArtist length]) { - [menu indentItem: - [menu addItemWithTitle:curArtist action:nil keyEquivalent:@""]]; + + if ([defaults boolForKey:@"showArtist"]) { + NSString *curArtist = nil; + NS_DURING + curArtist = [mtr currentSongArtist]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Add Track Artist (\"%@\") menu item.", curArtist); + if ( curArtist ) { + [menu indentItem: + [menu addItemWithTitle:curArtist action:nil keyEquivalent:@""]]; + } } - } - - if ([defaults boolForKey:@"showTrackNumber"]) { - int track = [currentRemote currentSongTrack]; - ITDebugLog(@"Add Track Number (\"Track %i\") menu item.", track); - if (track) { - [menu indentItem: - [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %i", NSLocalizedString(@"track", @"Track"), track] action:nil keyEquivalent:@""]]; + + if ([defaults boolForKey:@"showComposer"]) { + NSString *curComposer = nil; + NS_DURING + curComposer = [mtr currentSongComposer]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Add Track Composer (\"%@\") menu item.", curComposer); + if ( curComposer ) { + [menu indentItem: + [menu addItemWithTitle:curComposer action:nil keyEquivalent:@""]]; + } + } + + if ([defaults boolForKey:@"showTrackNumber"]) { + int track = 0; + NS_DURING + track = [mtr currentSongTrack]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Add Track Number (\"Track %i\") menu item.", track); + if ( track > 0 ) { + [menu indentItem: + [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %i", NSLocalizedString(@"track", @"Track"), track] action:nil keyEquivalent:@""]]; + } } } - if ([defaults boolForKey:@"showTime"]) { - int left = [[currentRemote currentSongRemaining] intValue]; - NSString *remaining = [NSString stringWithFormat:@"%i:%02i", left / 60, left % 60]; - ITDebugLog(@"Add Track Remaining (\"%@/%@\") menu item.", remaining, [currentRemote currentSongLength]); - [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", remaining, [currentRemote currentSongLength]] action:nil keyEquivalent:@""]]; - } - - if ([defaults boolForKey:@"showTrackRating"]) { - NSString *string = nil; - switch ((int)([currentRemote currentSongRating] * 5)) { - case 0: - string = [NSString stringWithUTF8String:"☆☆☆☆☆"]; - break; - case 1: - string = [NSString stringWithUTF8String:"★☆☆☆☆"]; - break; - case 2: - string = [NSString stringWithUTF8String:"★★☆☆☆"]; - break; - case 3: - string = [NSString stringWithUTF8String:"★★★☆☆"]; - break; - case 4: - string = [NSString stringWithUTF8String:"★★★★☆"]; - break; - case 5: - string = [NSString stringWithUTF8String:"★★★★★"]; - break; + NS_DURING + 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:@""]]; } - ITDebugLog(@"Add Track Rating (\"%@\") menu item.", string); - [menu indentItem:[menu addItemWithTitle:string action:nil keyEquivalent:@""]]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + + if (!_playingRadio) { + NS_DURING + 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)([mtr currentSongRating] * 5)) { + case 0: + string = [NSString stringWithUTF8String:"☆☆☆☆☆"]; + break; + case 1: + string = [NSString stringWithUTF8String:"★☆☆☆☆"]; + break; + case 2: + string = [NSString stringWithUTF8String:"★★☆☆☆"]; + break; + case 3: + string = [NSString stringWithUTF8String:"★★★☆☆"]; + break; + case 4: + string = [NSString stringWithUTF8String:"★★★★☆"]; + break; + case 5: + string = [NSString stringWithUTF8String:"★★★★★"]; + break; + } + ITDebugLog(@"Add Track Rating (\"%@\") menu item.", string); + [menu indentItem:[menu addItemWithTitle:string action:nil keyEquivalent:@""]]; + } + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + + /*if ([tempItem respondsToSelector:@selector(setAttributedTitle:)] && [defaults boolForKey:@"showAlbumArtwork"] && ![[NetworkController sharedController] isConnectedToServer]) { + NSImage *image = [mtr currentSongAlbumArt]; + if (image) { + NSSize oldSize, newSize; + oldSize = [image size]; + if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width)); + else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110); + image = [[[[NSImage alloc] initWithData:[image TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize]; + + tempItem = [menu addItemWithTitle:@"" action:nil keyEquivalent:@""]; + NSTextAttachment *attachment = [[[NSTextAttachment alloc] init] autorelease]; + [[attachment attachmentCell] setImage:image]; + NSAttributedString *attrString = [NSAttributedString attributedStringWithAttachment:attachment]; + [tempItem setAttributedTitle:attrString]; + } + }*/ } } else { ITDebugLog(@"No Track is Playing, Add \"No Song\" menu item."); @@ -282,7 +391,32 @@ ITDebugLog(@"Add a separator menu item."); [menu addItem:[NSMenuItem separatorItem]]; //Submenu items - } else if ([nextObject isEqualToString:@"songRating"]) { + } else if ([nextObject isEqualToString:@"playlists"]) { + ITDebugLog(@"Add \"Playlists\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"playlists", @"Playlists") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_playlistsMenu]; + [tempItem setTag:3]; + } else if ([nextObject isEqualToString:@"eqPresets"]) { + ITDebugLog(@"Add \"EQ Presets\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"eqPresets", @"EQ Presets") + action:nil + keyEquivalent:@""]; + [tempItem setSubmenu:_eqMenu]; + [tempItem setTag:4]; + + itemEnum = [[_eqMenu itemArray] objectEnumerator]; + while ( (tempItem = [itemEnum nextObject]) ) { + [tempItem setState:NSOffState]; + } + NS_DURING + [[_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 @@ -298,7 +432,11 @@ [tempItem setState:NSOffState]; } - [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState]; + 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") @@ -309,26 +447,20 @@ if (_playingRadio || !_currentPlaylist) { [tempItem setEnabled:NO]; } - } else if ([nextObject isEqualToString:@"playlists"]) { - ITDebugLog(@"Add \"Playlists\" submenu."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"playlists", @"Playlists") + } else if ([nextObject isEqualToString:@"artists"]) { + ITDebugLog(@"Add \"Artists\" submenu."); + tempItem = [menu addItemWithTitle:NSLocalizedString(@"artists", @"Artists") action:nil keyEquivalent:@""]; - [tempItem setSubmenu:_playlistsMenu]; - [tempItem setTag:3]; - } else if ([nextObject isEqualToString:@"eqPresets"]) { - ITDebugLog(@"Add \"EQ Presets\" submenu."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"eqPresets", @"EQ Presets") + [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:_eqMenu]; - [tempItem setTag:4]; - - itemEnum = [[_eqMenu itemArray] objectEnumerator]; - while ( (tempItem = [itemEnum nextObject]) ) { - [tempItem setState:NSOffState]; - } - [[_eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState]; + [tempItem setSubmenu:_albumsMenu]; + [tempItem setTag:6]; } } ITDebugLog(@"Finished building menu."); @@ -340,10 +472,14 @@ - (NSMenu *)menuForNoPlayer { NSMenu *menu = [[NSMenu alloc] initWithTitle:@""]; - NSMenuItem *tempItem; + id tempItem = nil; ITDebugLog(@"Creating menu for when player isn't running."); - ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]); - tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"open", @"Open"), [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""]; + NS_DURING + ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]); + tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"open", @"Open"), [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER [tempItem setTag:MTMenuShowPlayerItem]; [tempItem setTarget:self]; ITDebugLog(@"Add a separator menu item."); @@ -352,6 +488,12 @@ 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]; @@ -359,28 +501,61 @@ return [menu autorelease]; } -- (void)rebuildSubmenus +- (BOOL)rebuildSubmenus { + NSArray *menu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"]; ITDebugLog(@"Rebuilding all of the submenus."); - - currentRemote = [[MainController sharedController] currentRemote]; - _currentPlaylist = [currentRemote currentPlaylistIndex]; - _currentTrack = [currentRemote currentSongIndex]; - _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); - + NS_DURING + _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 @@ -414,20 +589,35 @@ - (NSMenu *)upcomingSongsMenu { - NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; - int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:_currentPlaylist]; - int 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 = [currentRemote songTitleAtIndex:i]; - NSMenuItem *songItem; + NSString *curSong = nil; + NS_DURING + curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + id songItem; ITDebugLog(@"Adding song: %@", curSong); songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""]; [songItem setTag:i]; @@ -437,17 +627,32 @@ } } } + + if ([upcomingSongsMenu numberOfItems] == 0) { + [upcomingSongsMenu addItemWithTitle:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.") action:NULL keyEquivalent:@""]; + } } 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 +/*- (NSMenu *)playlistsMenu { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; - NSArray *playlists = [currentRemote playlists]; - NSMenuItem *tempItem; + NSArray *playlists; + id tempItem; + ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; int i; + NS_DURING + playlists = [[[MainController sharedController] currentRemote] playlists]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER ITDebugLog(@"Building \"Playlists\" menu."); @@ -459,22 +664,158 @@ [tempItem setTarget:self]; } - if (!_playingRadio && _currentPlaylist) { + if (source == ITMTRemoteRadioSource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:NULL keyEquivalent:@""] setState:NSOnState]; + } else if (source == ITMTRemoteGenericDeviceSource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"genericDevice", @"Generic Device") action:NULL keyEquivalent:@""] setState:NSOnState]; + } else if (source == ITMTRemoteiPodSource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"iPod", @"iPod") action:NULL keyEquivalent:@""] setState:NSOnState]; + } else if (source == ITMTRemoteCDSource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"cd", @"CD") action:NULL keyEquivalent:@""] setState:NSOnState]; + } else if (source == ITMTRemoteSharedLibrarySource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"sharedLibrary", @"Shared Library") action:NULL keyEquivalent:@""] setState:NSOnState]; + } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) { [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; } ITDebugLog(@"Done Building \"Playlists\" menu"); 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 +{ + NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; + NSArray *playlists = nil; + id tempItem; + ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; + int i; + NSMutableArray *indices = [[NSMutableArray alloc] init]; + NS_DURING + playlists = [[[MainController sharedController] currentRemote] playlists]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + + if (!playlists) { + [playlistsMenu release]; + return nil; + } + NS_DURING + ITDebugLog(@"Building \"Playlists\" menu."); + { + //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:[NSNumber numberWithInt:[library index]]]; + } + + //Next go through the other sources + if ([playlists count] > 1) { + //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 if ([playlists count] > 2) { + [playlistsMenu addItem:[NSMenuItem separatorItem]]; + } + } + + //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 ( ([nextSource type] == ITMTRemoteiPodSource) && [self iPodWithNameAutomaticallyUpdates:name] ) { + ITDebugLog(@"Invalid iPod source."); + [playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""]; + } else { + 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:[NSNumber numberWithInt:[nextSource index]]]; + } + } + } + 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]; + } + } + 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"); + 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 = [currentRemote eqPresets]; - NSMenuItem *tempItem; + NSArray *eqPresets = nil; + id tempItem; int i; + NS_DURING + eqPresets = [[[MainController sharedController] currentRemote] eqPresets]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + 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] ) ) { @@ -490,6 +831,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] ) @@ -522,10 +903,18 @@ ITDebugLog(@"Performing Menu Action: Preferences..."); [[MainController sharedController] showPreferences]; break; + case MTMenuAboutItem: + ITDebugLog(@"Performing Menu Action: About MenuTunes..."); + [[ITAboutWindowController sharedController] showAboutWindow]; + break; case MTMenuQuitItem: 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; @@ -556,6 +945,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"); @@ -588,7 +988,7 @@ } - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers - onItem:(NSMenuItem *)item + onItem:(id )item { unichar charcode = 'a'; int i; @@ -639,7 +1039,7 @@ SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph); charcode = 'b';*/ unichar buffer; - [[NSString stringWithString:@"_"] getCharacters:&buffer]; // this will have to do for now :( + [[NSString stringWithString:@" "] getCharacters:&buffer]; // this will have to do for now :( charcode = buffer; } break; @@ -700,8 +1100,8 @@ break; case 105: - ITDebugLog(@"Keycode for menu item \"%@\": 105 (F3)", [item title]); - charcode = NSF3FunctionKey; + ITDebugLog(@"Keycode for menu item \"%@\": 105 (F13)", [item title]); + charcode = NSF13FunctionKey; break; case 107: @@ -807,4 +1207,40 @@ ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]); } +- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name +{ + NSArray *volumes = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths]; + NSEnumerator *volEnum = [volumes objectEnumerator]; + NSString *nextVolume; + ITDebugLog(@"Looking for an iPod named %@", name); + while ( (nextVolume = [volEnum nextObject]) ) { + ITDebugLog(@"- %@", nextVolume); + if ([nextVolume rangeOfString:name options:nil /*range:NSMakeRange(0, [name length] - 1)*/].location != NSNotFound) { + NSFileHandle *handle; + NSData *data; + NSString *path = [nextVolume stringByAppendingPathComponent:@"/iPod_Control/iTunes/iTunesPrefs"]; + if ( ![[NSFileManager defaultManager] fileExistsAtPath:path] ) { + ITDebugLog(@"Error, path isn't an iPod! %@", path); + return NO; + } + handle = [NSFileHandle fileHandleForReadingAtPath:path]; + ITDebugLog(@"File handle: %@", handle); + [handle seekToFileOffset:10]; + data = [handle readDataOfLength:1]; + ITDebugLog(@"Data: %@", data); + if ( (*((unsigned char*)[data bytes]) == 0x00) ) { + ITDebugLog(@"iPod is manually updated. %@", path); + return NO; + } else if ( ( *((unsigned char*)[data bytes]) == 0x01 ) ) { + ITDebugLog(@"iPod is automatically updated. %@", path); + return YES; + } else { + ITDebugLog(@"Error! Value: %h Desc: %@ Path: %@", *((unsigned char*)[data bytes]), [data description], path); + return NO; + } + } + } + return YES; +} + @end \ No newline at end of file