X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/775df65cfdd7c0d32917a5b9b1ffb5923b1297d7..1cbd9d0238d3cc19b63733d7b9b236cff3caffe5:/MenuController.m?ds=sidebyside

diff --git a/MenuController.m b/MenuController.m
index 2bd03d1..dfa9a03 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -238,7 +238,7 @@
         } else if ([nextObject isEqualToString:@"trackInfo"]) {
             ITDebugLog(@"Check to see if a Track is playing...");
             //Handle playing radio too
-            if (_currentPlaylist) {
+            if (_currentTrack != -1 && _currentPlaylist) {
                 NSString *title = nil;
                 NS_DURING
                     title = [mtr currentSongTitle];
@@ -403,7 +403,6 @@
             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
@@ -492,50 +491,61 @@
     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 ([menu containsObject:@"artists"]) {
+	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 ([menu containsObject:@"albums"]) {
+    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
@@ -569,15 +579,22 @@
 
 - (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) {
@@ -606,7 +623,12 @@
         }
     }
     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
@@ -663,6 +685,12 @@
     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];
@@ -677,6 +705,7 @@
         ITDebugLog(@"Adding index to the index array.");
         [indices addObject:[curPlaylist objectAtIndex:2]];
     }
+	
     if ([playlists count] > 1) {
         if ([[[playlists objectAtIndex:1] objectAtIndex:1] intValue] == ITMTRemoteRadioSource) {
             [indices addObject:[[playlists objectAtIndex:1] objectAtIndex:2]];
@@ -688,7 +717,7 @@
             [playlistsMenu addItem:[NSMenuItem separatorItem]];
         }
     }
-    
+	
     if ([playlists count] > 1) {
         for (i = 1; i < [playlists count]; i++) {
             NSArray *curPlaylist = [playlists objectAtIndex:i];
@@ -715,19 +744,29 @@
         }
     }
     ITDebugLog(@"Checking the current source.");
-    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_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
+	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");
-    return playlistsMenu;
+    NS_VALUERETURN(playlistsMenu, NSMenu *);
+	NS_HANDLER
+		[playlistsMenu release];
+		_continue = NO;
+		NS_VALUERETURN(nil, NSMenu *);
+	NS_ENDHANDLER
 }
 
 - (NSMenu *)eqMenu
@@ -748,11 +787,6 @@
     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++) {
@@ -772,7 +806,7 @@
 
 - (NSMenu *)artistsMenu
 {
-    NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@""];
+    NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@"Artists"];
     NSEnumerator *artistsEnumerator;
     NSString *nextArtist;
     id <NSMenuItem> tempItem;
@@ -781,8 +815,6 @@
         artistsEnumerator = [[[[MainController sharedController] currentRemote] artists] objectEnumerator];
         while ( (nextArtist = [artistsEnumerator nextObject]) ) {
             tempItem = [artistsMenu addItemWithTitle:nextArtist action:@selector(performBrowseMenuAction:) keyEquivalent:@""];
-            [tempItem setRepresentedObject:nextArtist];
-            [tempItem setTag:1];
             [tempItem setTarget:self];
         }
     NS_HANDLER
@@ -794,7 +826,7 @@
 
 - (NSMenu *)albumsMenu
 {
-    NSMenu *albumsMenu = [[NSMenu alloc] initWithTitle:@""];
+    NSMenu *albumsMenu = [[NSMenu alloc] initWithTitle:@"Albums"];
     NSEnumerator *albumsEnumerator;
     NSString *nextAlbum;
     id <NSMenuItem> tempItem;
@@ -803,8 +835,6 @@
         albumsEnumerator = [[[[MainController sharedController] currentRemote] albums] objectEnumerator];
         while ( (nextAlbum = [albumsEnumerator nextObject]) ) {
             tempItem = [albumsMenu addItemWithTitle:nextAlbum action:@selector(performBrowseMenuAction:) keyEquivalent:@""];
-            [tempItem setRepresentedObject:nextAlbum];
-            [tempItem setTag:2];
             [tempItem setTarget:self];
         }
     NS_HANDLER
@@ -886,13 +916,13 @@
 
 - (void)performBrowseMenuAction:(id)sender
 {
-    ITDebugLog(@"Browse action selected on item with object %@ and tag %i", [sender representedObject], [sender tag]);
+    ITDebugLog(@"Browse action selected on item named %@", [sender title]);
     /*
     ** 1 - Artist
     ** 2 - Album
     ** 3 - Genre?
     */
-    [[MainController sharedController] makePlaylistWithTerm:[sender representedObject] ofType:[sender tag]];
+    [[MainController sharedController] makePlaylistWithTerm:[sender title] ofType:(([[[sender menu] title] isEqualToString:@"Artists"]) ? 1 : 2)];
 }
 
 - (void)updateMenu