From 8cb555460ff79e636a7907fb2589e16db98c8600 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 17 Jul 2020 00:01:32 -0400 Subject: [3/4] Completely remove HWCODEC support 'swcodec' is now always set (and recording_swcodec for recording-capable units) in feature.txt so the manual and language strings don't need to all be fixed up. Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0 --- apps/menus/radio_menu.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'apps/menus/radio_menu.c') diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c index 8871421c11..a6d259a21d 100644 --- a/apps/menus/radio_menu.c +++ b/apps/menus/radio_menu.c @@ -34,7 +34,7 @@ #ifdef HAVE_RECORDING #include "recording.h" /* recording_screen() */ -#if defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC +#if defined(HAVE_FMRADIO_REC) #define FM_RECORDING_SCREEN static int fm_recording_screen(void) { @@ -53,30 +53,20 @@ static int fm_recording_screen(void) MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), fm_recording_screen, NULL, NULL, Icon_Recording); -#endif /* defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC */ +#endif /* defined(HAVE_FMRADIO_REC) */ -#if defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC +#if defined(HAVE_FMRADIO_REC) #define FM_RECORDING_SETTINGS static int fm_recording_settings(void) { int ret = recording_menu(true); -#if CONFIG_CODEC != SWCODEC - if (!ret) - { - struct audio_recording_options rec_options; - rec_init_recording_options(&rec_options); - rec_options.rec_source = AUDIO_SRC_LINEIN; - rec_set_recording_options(&rec_options); - } -#endif - return ret; } MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), fm_recording_settings, NULL, NULL, Icon_Recording); -#endif /* defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC */ +#endif /* defined(HAVE_FMRADIO_REC) */ #endif /* HAVE_RECORDING */ #ifndef FM_PRESET -- cgit v1.2.3