if ([defaults boolForKey:@"showAlbum"]) {
NSString *curAlbum = [currentRemote currentSongAlbum];
ITDebugLog(@"Add Track Album (\"%@\") menu item.", curAlbum);
- if ([curAlbum length]) {
+ if ( curAlbum ) {
[menu indentItem:
[menu addItemWithTitle:curAlbum action:nil keyEquivalent:@""]];
}
if ([defaults boolForKey:@"showArtist"]) {
NSString *curArtist = [currentRemote currentSongArtist];
ITDebugLog(@"Add Track Artist (\"%@\") menu item.", curArtist);
- if ([curArtist length]) {
+ if ( curArtist ) {
[menu indentItem:
[menu addItemWithTitle:curArtist action:nil keyEquivalent:@""]];
}
if ([defaults boolForKey:@"showTrackNumber"]) {
int track = [currentRemote currentSongTrack];
ITDebugLog(@"Add Track Number (\"Track %i\") menu item.", track);
- if (track) {
+ if ( track ) {
[menu indentItem:
[menu addItemWithTitle:[NSString stringWithFormat:@"%@ %i", NSLocalizedString(@"track", @"Track"), track] action:nil keyEquivalent:@""]];
}
}
if ([defaults boolForKey:@"showTime"]) {
- int left = [[currentRemote currentSongRemaining] intValue];
- NSString *remaining = [NSString stringWithFormat:@"%i:%02i", left / 60, left % 60];
- ITDebugLog(@"Add Track Remaining (\"%@/%@\") menu item.", remaining, [currentRemote currentSongLength]);
- [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", remaining, [currentRemote currentSongLength]] action:nil keyEquivalent:@""]];
+ int left = [[currentRemote currentSongElapsed] intValue];
+ NSString *elapsed = [NSString stringWithFormat:@"%i:%02i", left / 60, left % 60];
+ ITDebugLog(@"Add Track Elapsed (\"%@/%@\") menu item.", elapsed, [currentRemote currentSongLength]);
+ [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", elapsed, [currentRemote currentSongLength]] action:nil keyEquivalent:@""]];
}
if ([defaults boolForKey:@"showTrackRating"]) {