X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/c17d6e218e09277277fa3d0b267407e229b2ad15..f7e2632e0797735e202e5837edeaa3f21fd8d382:/MenuController.m?ds=sidebyside diff --git a/MenuController.m b/MenuController.m index c2970f6..dfd4f49 100755 --- a/MenuController.m +++ b/MenuController.m @@ -22,7 +22,7 @@ - (NSMenu *)eqMenu; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers onItem:(id )item; -//- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name; +- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name; @end @implementation MenuController @@ -497,7 +497,6 @@ if (_currentPlaylist && !_playingRadio) { if (numSongs > 0) { int i; - for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong; @@ -525,7 +524,7 @@ return upcomingSongsMenu; } -- (NSMenu *)playlistsMenu +/*- (NSMenu *)playlistsMenu { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; NSArray *playlists; @@ -563,18 +562,21 @@ } ITDebugLog(@"Done Building \"Playlists\" menu"); return playlistsMenu; -} +}*/ -/*- (NSMenu *)playlistsMenu +- (NSMenu *)playlistsMenu { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; NSArray *playlists; - NSMenuItem *tempItem; + id tempItem; ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; int i, j; NS_DURING playlists = [[[MainController sharedController] currentRemote] playlists]; + /*playlists = [NSArray arrayWithObjects: + [NSArray arrayWithObjects:@"Library", [NSNumber numberWithInt:-1], @"Library", @"Playlist", nil], + [NSArray arrayWithObjects:@"Radio", [NSNumber numberWithInt:1], @"Radio", nil], nil];*/ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -590,7 +592,6 @@ [tempItem setTarget:self]; } } - if ( (source == ITMTRemoteRadioSource) || ([playlists count] - 2 > 0) ) { [playlistsMenu addItem:[NSMenuItem separatorItem]]; } @@ -627,7 +628,7 @@ } ITDebugLog(@"Done Building \"Playlists\" menu"); return playlistsMenu; -}*/ +} - (NSMenu *)eqMenu { @@ -980,7 +981,7 @@ ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]); } -/*- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name +- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name { NSArray *volumes = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths]; NSEnumerator *volEnum = [volumes objectEnumerator]; @@ -1010,6 +1011,7 @@ } } } -}*/ + return NO; +} @end \ No newline at end of file