X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/77fcca750711207d8a493d227f61bf6b6fc5ecc1..a5c365dd668dee7c653dbafee270e5e05025a2ab:/MainController.m?ds=sidebyside diff --git a/MainController.m b/MainController.m index 7c60fb0..5406ad9 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."); @@ -891,7 +902,7 @@ static MainController *sharedController; if ( [df boolForKey:@"showTime"] ) { NS_DURING time = [NSString stringWithFormat:@"%@: %@ / %@", - @"Time", + NSLocalizedString(@"time", @"Time"), [[self currentRemote] currentSongElapsed], [[self currentRemote] currentSongLength]]; NS_HANDLER @@ -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 @@ -1099,9 +1110,9 @@ static MainController *sharedController; - (void)setRating:(ITHotKey *)sender { - float rating = ([[sender name] characterAtIndex:9] - 48) / 5.0; - [self selectSongRating:rating]; - [statusWindowController showRatingWindowWithRating:rating]; + int stars = [[sender name] characterAtIndex:9] - 48; + [self selectSongRating:stars * 20]; + [statusWindowController showRatingWindowWithRating:(float)stars / 5.0]; } - (void)toggleLoop