X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/89e6aacd25d9f355b9dac9c22973e6a5161b3f88..b69eee35badf2aaca494fe27250fcd3f5f077cbb:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 4898c09..3916267 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -518,18 +518,22 @@
                 }
             }
         }
+        
+        if ([upcomingSongsMenu numberOfItems] == 0) {
+            [upcomingSongsMenu addItemWithTitle:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.") action:NULL keyEquivalent:@""];
+        }
     }
     ITDebugLog(@"Done Building \"Upcoming Songs\" menu.");
     return upcomingSongsMenu;
 }
 
-- (NSMenu *)playlistsMenu
+/*- (NSMenu *)playlistsMenu
 {
     NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
     NSArray *playlists;
     NSMenuItem *tempItem;
+    ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
     int i;
-    
     NS_DURING
         playlists = [[[MainController sharedController] currentRemote] playlists];
     NS_HANDLER
@@ -546,7 +550,76 @@
         [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;
+}*/
+
+
+- (NSMenu *)playlistsMenu
+{
+    NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
+    NSArray *playlists;
+    NSMenuItem *tempItem;
+    ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
+    int i, j;
+    NS_DURING
+        playlists = [[[MainController sharedController] currentRemote] playlists];
+    NS_HANDLER
+        [[MainController sharedController] networkError:localException];
+    NS_ENDHANDLER
+    ITDebugLog(@"Building \"Playlists\" menu.");
+    {
+        NSArray *curPlaylist = [playlists objectAtIndex:0];
+        NSString *name = [curPlaylist objectAtIndex:0];
+        ITDebugLog(@"Adding main source: %@", name);
+        for (i = 1; 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];
+        }
+    }
+    
+    if ( (source == ITMTRemoteRadioSource) || ([playlists count] - 2 > 0) ) {
+        [playlistsMenu addItem:[NSMenuItem separatorItem]];
+    }
+    
+    if (source == ITMTRemoteRadioSource) {
+        [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState];
+    }
+    
+    for (i = 2; i < [playlists count]; i++) {
+        NSArray *curPlaylist = [playlists objectAtIndex:i];
+        NSString *name = [curPlaylist objectAtIndex:0];
+        NSMenu *submenu = [[NSMenu alloc] init];
+        ITDebugLog(@"Adding source: %@", name);
+        for (j = 1; 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]];
+    }
+    
+    if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ){
+        tempItem = [playlistsMenu itemAtIndex:(int)[[[MainController sharedController] currentRemote] currentSourceIndex] + [playlistsMenu numberOfItems] - 6];
+        [tempItem setState:NSOnState];
+        [[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
+    } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) {
         [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
     }
     ITDebugLog(@"Done Building \"Playlists\" menu");