diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index 3e2f5cf4a..2fc78474e 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -25,17 +25,17 @@ - + - + - + - + @@ -273,7 +273,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -644,6 +644,94 @@ + + @@ -672,7 +760,7 @@ - + @@ -685,7 +773,7 @@ - + diff --git a/Playlist/PlaylistController.h b/Playlist/PlaylistController.h index 2076cab22..0c659a53f 100644 --- a/Playlist/PlaylistController.h +++ b/Playlist/PlaylistController.h @@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, URLOrigin) { IBOutlet AppController *appController; NSValueTransformer *statusImageTransformer; + NSValueTransformer *numberHertzToStringTransformer; NSMutableArray *shuffleList; NSMutableArray *queueList; diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 7cddbb543..05a705f04 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -49,7 +49,8 @@ static void *playlistControllerContext = &playlistControllerContext; + (void)initialize { cellIdentifiers = @[@"index", @"status", @"title", @"albumartist", @"artist", @"album", @"length", @"year", @"genre", @"track", @"path", - @"filename", @"codec", @"rating"]; + @"filename", @"codec", @"rating", @"samplerate", + @"bitspersample"]; NSValueTransformer *repeatNoneTransformer = [[RepeatModeTransformer alloc] initWithMode:RepeatModeNoRepeat]; @@ -151,6 +152,7 @@ static void *playlistControllerContext = &playlistControllerContext; [super awakeFromNib]; statusImageTransformer = [NSValueTransformer valueTransformerForName:@"StatusImageTransformer"]; + numberHertzToStringTransformer = [NSValueTransformer valueTransformerForName:@"NumberHertzToStringTransformer"]; NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"index" ascending:YES]; [self.tableView setSortDescriptors:@[sortDescriptor]]; @@ -509,6 +511,16 @@ static void *playlistControllerContext = &playlistControllerContext; cellRating = YES; break; } + + case 14: + cellText = [numberHertzToStringTransformer transformedValue:@(pe.sampleRate)]; + cellTextAlignment = NSTextAlignmentRight; + break; + + case 15: + cellText = [NSString stringWithFormat:@"%u", pe.bitsPerSample]; + cellTextAlignment = NSTextAlignmentRight; + break; } }