- (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;
NSEnumerator *itemEnum;
ITHotKey *hotKey;
NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys];
+ ITMTRemote *mtr = [[MainController sharedController] currentRemote];
int currentSongRating = 0;
//Get the information
NS_DURING
- _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex];
- _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
- currentSongRating = ( [[[MainController sharedController] currentRemote] currentSongRating] != -1 );
+ _currentPlaylist = [mtr currentPlaylistIndex];
+ _playingRadio = ([mtr currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
+ currentSongRating = ( [mtr currentSongRating] != -1 );
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
[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
ITDebugLog(@"Set \"Play\"/\"Pause\" menu item's title to correct state.");
NS_DURING
- switch ([[[MainController sharedController] currentRemote] playerPlayingState]) {
+ switch ([mtr playerPlayingState]) {
case ITMTRemotePlayerPlaying:
[tempItem setTitle:NSLocalizedString(@"pause", @"Pause")];
break;
NS_DURING
tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@",
NSLocalizedString(@"show", @"Show"),
- [[[MainController sharedController] currentRemote] playerSimpleName]]
+ [mtr playerSimpleName]]
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
NS_HANDLER
if (_currentPlaylist) {
NSString *title = nil;
NS_DURING
- title = [[[MainController sharedController] currentRemote] currentSongTitle];
+ title = [mtr currentSongTitle];
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
if ([defaults boolForKey:@"showAlbum"]) {
NSString *curAlbum = nil;
NS_DURING
- curAlbum = [[[MainController sharedController] currentRemote] currentSongAlbum];
+ curAlbum = [mtr currentSongAlbum];
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
if ([defaults boolForKey:@"showArtist"]) {
NSString *curArtist = nil;
NS_DURING
- curArtist = [[[MainController sharedController] currentRemote] currentSongArtist];
+ curArtist = [mtr currentSongArtist];
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
if ([defaults boolForKey:@"showComposer"]) {
NSString *curComposer = nil;
NS_DURING
- curComposer = [[[MainController sharedController] currentRemote] currentSongComposer];
+ curComposer = [mtr currentSongComposer];
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
if ([defaults boolForKey:@"showTrackNumber"]) {
int track = 0;
NS_DURING
- track = [[[MainController sharedController] currentRemote] currentSongTrack];
+ track = [mtr currentSongTrack];
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
}
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:@""]];
+ 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:@""]];
}
NS_HANDLER
[[MainController sharedController] networkError:localException];
if (!_playingRadio) {
NS_DURING
- if ([defaults boolForKey:@"showTrackRating"] && ( [[[MainController sharedController] currentRemote] currentSongRating] != -1.0 )) {
+ 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)([[[MainController sharedController] currentRemote] currentSongRating] * 5)) {
+ switch ((int)([mtr currentSongRating] * 5)) {
case 0:
string = [NSString stringWithUTF8String:"☆☆☆☆☆"];
break;
NS_ENDHANDLER
/*if ([tempItem respondsToSelector:@selector(setAttributedTitle:)] && [defaults boolForKey:@"showAlbumArtwork"] && ![[NetworkController sharedController] isConnectedToServer]) {
- NSImage *image = [[[MainController sharedController] currentRemote] currentSongAlbumArt];
+ NSImage *image = [mtr currentSongAlbumArt];
if (image) {
NSSize oldSize, newSize;
oldSize = [image size];
[tempItem setState:NSOffState];
}
NS_DURING
- [[_eqMenu itemAtIndex:([[[MainController sharedController] currentRemote] currentEQPresetIndex] - 1)] setState:NSOnState];
+ [[_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
- 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(@"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;
- (void)rebuildSubmenus
{
+ NSArray *menu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
ITDebugLog(@"Rebuilding all of the submenus.");
NS_DURING
_currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex];
[_playlistsMenu release];
ITDebugLog(@" - EQ menu");
[_eqMenu release];
+
ITDebugLog(@"Beginning Rebuild of \"Song Rating\" submenu.");
_ratingMenu = [self ratingMenu];
ITDebugLog(@"Beginning Rebuild of \"Upcoming Songs\" submenu.");
_playlistsMenu = [self playlistsMenu];
ITDebugLog(@"Beginning Rebuild of \"EQ Presets\" submenu.");
_eqMenu = [self eqMenu];
+
+ if ([menu containsObject:@"artists"]) {
+ ITDebugLog(@"Releasing artists menu");
+ [_artistsMenu release];
+ ITDebugLog(@"Beginning Rebuild of \"Artists\" submenu.");
+ _artistsMenu = [self artistsMenu];
+ }
+
+ if ([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.");
}
{
NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
int numSongs = 0, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
-
NS_DURING
numSongs = [[[MainController sharedController] currentRemote] numberOfSongsInPlaylistAtIndex:_currentPlaylist];
NS_HANDLER
[[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
}
[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;
}
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] ) ) {
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