X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9d8dbcc95c9e3ea959f034d5ddb2edcc71fe1f59..a06b23045deb51ce036acf7bdcd3ab3c5514bfaf:/MenuController.m?ds=inline diff --git a/MenuController.m b/MenuController.m index f57f331..088d337 100755 --- a/MenuController.m +++ b/MenuController.m @@ -8,6 +8,7 @@ #import "MenuController.h" #import "MainController.h" +#import "ITMTRemote.h" #import #import #import @@ -44,10 +45,16 @@ NSEnumerator *itemEnum; ITHotKey *hotKey; NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys]; + int currentSongRating; //Get the information - _currentPlaylist = [currentRemote currentPlaylistIndex]; - _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + NS_DURING + _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; + _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + currentSongRating = ( [[[MainController sharedController] currentRemote] currentSongRating] != -1 ); + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER ITDebugLog(@"Reset menu if required."); @@ -63,12 +70,12 @@ } 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]; } @@ -96,17 +103,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 ([[[MainController sharedController] currentRemote] 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 +178,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"), + [[[MainController sharedController] currentRemote] playerSimpleName]] + action:@selector(performMainMenuAction:) + keyEquivalent:@""]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER itemEnum = [hotKeys objectEnumerator]; while ( (hotKey = [itemEnum nextObject]) ) { @@ -193,24 +208,28 @@ [tempItem setTag:MTMenuPreferencesItem]; [tempItem setTarget:self]; } else if ([nextObject isEqualToString:@"quit"]) { - ITDebugLog(@"Add \"Quit\" menu item."); - tempItem = [menu addItemWithTitle:NSLocalizedString(@"quit", @"Quit") - action:@selector(performMainMenuAction:) - keyEquivalent:@""]; - [tempItem setTag:MTMenuQuitItem]; - [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]; + [tempItem setTarget:self]; } else if ([nextObject isEqualToString:@"trackInfo"]) { ITDebugLog(@"Check to see if a Track is playing..."); //Handle playing radio too if (_currentPlaylist) { - NSString *title = [currentRemote currentSongTitle]; - + NSString *title; + NS_DURING + title = [[[MainController sharedController] currentRemote] 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:@""]; @@ -221,64 +240,89 @@ [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; + NS_DURING + curAlbum = [[[MainController sharedController] currentRemote] 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; + NS_DURING + curArtist = [[[MainController sharedController] currentRemote] 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:@"showTrackNumber"]) { + int track; + NS_DURING + track = [[[MainController sharedController] currentRemote] 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"] && ( ([[[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:@""]]; } - 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:@"showTrackRating"] && ( [[[MainController sharedController] currentRemote] currentSongRating] != -1.0 )) { + NSString *string = nil; + switch ((int)([[[MainController sharedController] 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; + } + ITDebugLog(@"Add Track Rating (\"%@\") menu item.", string); + [menu indentItem:[menu addItemWithTitle:string action:nil keyEquivalent:@""]]; + } + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER } } else { ITDebugLog(@"No Track is Playing, Add \"No Song\" menu item."); @@ -288,33 +332,6 @@ ITDebugLog(@"Add a separator menu item."); [menu addItem:[NSMenuItem separatorItem]]; //Submenu items - } else if ([nextObject isEqualToString:@"songRating"]) { - 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]; - } - - [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState]; - } 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:@"playlists"]) { ITDebugLog(@"Add \"Playlists\" submenu."); tempItem = [menu addItemWithTitle:NSLocalizedString(@"playlists", @"Playlists") @@ -334,9 +351,44 @@ while ( (tempItem = [itemEnum nextObject]) ) { [tempItem setState:NSOffState]; } - [[_eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState]; + NS_DURING + [[_eqMenu itemAtIndex:([[[MainController sharedController] currentRemote] 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(@"Finished building menu."); [_currentMenu release]; _currentMenu = menu; @@ -348,8 +400,12 @@ NSMenu *menu = [[NSMenu alloc] initWithTitle:@""]; NSMenuItem *tempItem; 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."); @@ -375,10 +431,13 @@ { ITDebugLog(@"Rebuilding all of the submenus."); - currentRemote = [[MainController sharedController] currentRemote]; - _currentPlaylist = [currentRemote currentPlaylistIndex]; - _currentTrack = [currentRemote currentSongIndex]; - _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + NS_DURING + _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; + _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex]; + _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist); + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER [_ratingMenu release]; [_upcomingSongsMenu release]; @@ -427,8 +486,13 @@ - (NSMenu *)upcomingSongsMenu { NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; - int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:_currentPlaylist]; - int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; + int numSongs, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; + + NS_DURING + numSongs = [[[MainController sharedController] currentRemote] numberOfSongsInPlaylistAtIndex:_currentPlaylist]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER ITDebugLog(@"Building \"Upcoming Songs\" menu."); @@ -438,7 +502,12 @@ for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) { if (i <= numSongs) { - NSString *curSong = [currentRemote songTitleAtIndex:i]; + NSString *curSong; + NS_DURING + curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER NSMenuItem *songItem; ITDebugLog(@"Adding song: %@", curSong); songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""]; @@ -449,6 +518,10 @@ } } } + + if ([upcomingSongsMenu numberOfItems] == 0) { + [upcomingSongsMenu addItemWithTitle:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.") action:NULL keyEquivalent:@""]; + } } ITDebugLog(@"Done Building \"Upcoming Songs\" menu."); return upcomingSongsMenu; @@ -457,10 +530,16 @@ - (NSMenu *)playlistsMenu { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; - NSArray *playlists = [currentRemote playlists]; + NSArray *playlists; NSMenuItem *tempItem; int i; + NS_DURING + playlists = [[[MainController sharedController] currentRemote] playlists]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Building \"Playlists\" menu."); for (i = 0; i < [playlists count]; i++) { @@ -481,10 +560,16 @@ - (NSMenu *)eqMenu { NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""]; - NSArray *eqPresets = [currentRemote eqPresets]; + NSArray *eqPresets; NSMenuItem *tempItem; int i; + NS_DURING + eqPresets = [[[MainController sharedController] currentRemote] eqPresets]; + NS_HANDLER + [[MainController sharedController] networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Building \"EQ Presets\" menu."); for (i = 0; i < [eqPresets count]; i++) { @@ -655,7 +740,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; @@ -716,8 +801,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: