X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/f16e2f1f2b4778b4bc890162fa9cd31d7dd79b54..c1c078a84366c6e043d2fac0ab86c912e53bc804:/OldMainController.m diff --git a/OldMainController.m b/OldMainController.m index ea9bc47..0ade694 100755 --- a/OldMainController.m +++ b/OldMainController.m @@ -343,7 +343,7 @@ } //Set the new unique song identifier - lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain]; + lastSongIdentifier = [[currentRemote playerStateUniqueIdentifier] retain]; //If we're in a playlist or radio mode if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) { @@ -390,7 +390,7 @@ if ([defaults boolForKey:@"showAlbum"]) { NSString *album = [currentRemote currentSongAlbum]; - if ([album length] > 0) { + if ( album ) { [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1]; } } @@ -507,7 +507,7 @@ - (void)timerUpdate { - NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier]; + NSString *currentIdentifier = [currentRemote playerStateUniqueIdentifier]; if (![lastSongIdentifier isEqualToString:currentIdentifier] || (!isPlayingRadio && ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist))) { // @@ -765,7 +765,7 @@ if ([defaults boolForKey:@"showAlbum"]) { NSString *trackAlbum = [currentRemote currentSongAlbum]; - if ([trackAlbum length]) { + if ( trackAlbum ) { stringToShow = [stringToShow stringByAppendingString:trackAlbum]; stringToShow = [stringToShow stringByAppendingString:@"\n"]; }