From 01650b8bc9e400d3b90ebfba403033c7a87bc35e Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 30 Sep 2020 18:21:38 -0400 Subject: audio: Add support for 192 and 176KHz playback * SAMPR_CAPS_ALL -> SAMPR_CAPS_ALL_48/96/192 * All targets claiming SAMPR_CAPS_ALL now get appropriate subset * No need to explicitly define HAVE_PLAY_FREQ * Rates that are a multiple of 44 or 48KHz can be used for playback Inspired by a patch by Roman Stolyarov, but substantially rewritten by myself. Change-Id: Iaca7363521b1cb9921e047ba1004d3cbe9c9c23e --- apps/settings_list.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'apps/settings_list.c') diff --git a/apps/settings_list.c b/apps/settings_list.c index 64a150c806..41c20c7809 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -879,8 +879,18 @@ const struct settings_list settings[] = { ), /* CHOICE_SETTING( repeat_mode ) */ #ifdef HAVE_PLAY_FREQ STRINGCHOICE_SETTING(0, play_frequency, LANG_FREQUENCY, 0, +#if HAVE_PLAY_FREQ >= 192 + "playback frequency", "auto,44.1 kHz,48 kHz,88.2 kHz,96 kHz,176.4 kHz,192 kHz", NULL, 7, + LANG_AUTOMATIC, TALK_ID_DECIMAL(441, 1, UNIT_KHZ), TALK_ID(48, UNIT_KHZ), TALK_ID_DECIMAL(882, 1, UNIT_KHZ), TALK_ID(96, UNIT_KHZ), TALK_ID_DECIMAL(1764, 1, UNIT_KHZ), TALK_ID(192, UNIT_KHZ)), +#elif HAVE_PLAY_FREQ >= 96 + "playback frequency", "auto,44.1 kHz,48 kHz,88.2 kHz,96 kHz", NULL, 5, + LANG_AUTOMATIC, TALK_ID_DECIMAL(441, 1, UNIT_KHZ), TALK_ID(48, UNIT_KHZ), TALK_ID_DECIMAL(882, 1, UNIT_KHZ), TALK_ID(96, UNIT_KHZ)), +#elif HAVE_PLAY_FREQ >= 48 "playback frequency", "auto,44.1 kHz,48 kHz", NULL, 3, LANG_AUTOMATIC, TALK_ID_DECIMAL(441, 1, UNIT_KHZ), TALK_ID(48, UNIT_KHZ)), +#else + #error "HAVE_PLAY_FREQ < 48???" +#endif #endif /* HAVE_PLAY_FREQ */ /* LCD */ #ifdef HAVE_LCD_CONTRAST -- cgit v1.2.3