X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/74389742830709c876afb314ae07034bd675c9ac..79a7199e0417d8a6103095452f544c0f9f3e1178:/MainController.m diff --git a/MainController.m b/MainController.m index eb1aa3f..64af7d0 100755 --- a/MainController.m +++ b/MainController.m @@ -557,6 +557,17 @@ static MainController *sharedController; [self timerUpdate]; } +- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type +{ + ITDebugLog(@"Making playlist with term %@, type %i", term, type); + NS_DURING + [[self currentRemote] makePlaylistWithTerm:term ofType:type]; + NS_HANDLER + [self networkError:localException]; + NS_ENDHANDLER + ITDebugLog(@"Done making playlist"); +} + - (void)showPlayer { ITDebugLog(@"Beginning show player."); @@ -930,7 +941,7 @@ static MainController *sharedController; } } - if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] ) { + if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] && [[self currentRemote] currentSource] == ITMTRemoteLibrarySource ) { NS_DURING playCount = [[self currentRemote] currentSongPlayCount]; NS_HANDLER @@ -992,8 +1003,9 @@ static MainController *sharedController; - (void)popupMenu { if (!_popped) { - NSMenu *menu = [menuController menu]; _popped = YES; + [self menuClicked]; + NSMenu *menu = [statusItem menu]; [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]]; _popped = NO; }