diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 00:01:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 8cb555460ff79e636a7907fb2589e16db98c8600 (patch) | |
tree | 930a3878c7641c9ce045b24f0ade1309e36d5806 /apps/menus/radio_menu.c | |
parent | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff) | |
download | rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.zip |
[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
Diffstat (limited to 'apps/menus/radio_menu.c')
-rw-r--r-- | apps/menus/radio_menu.c | 18 |
1 files changed, 4 insertions, 14 deletions
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 @@ | |||
34 | #ifdef HAVE_RECORDING | 34 | #ifdef HAVE_RECORDING |
35 | #include "recording.h" /* recording_screen() */ | 35 | #include "recording.h" /* recording_screen() */ |
36 | 36 | ||
37 | #if defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC | 37 | #if defined(HAVE_FMRADIO_REC) |
38 | #define FM_RECORDING_SCREEN | 38 | #define FM_RECORDING_SCREEN |
39 | static int fm_recording_screen(void) | 39 | static int fm_recording_screen(void) |
40 | { | 40 | { |
@@ -53,30 +53,20 @@ static int fm_recording_screen(void) | |||
53 | 53 | ||
54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), | 54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), |
55 | fm_recording_screen, NULL, NULL, Icon_Recording); | 55 | fm_recording_screen, NULL, NULL, Icon_Recording); |
56 | #endif /* defined(HAVE_FMRADIO_REC) && CONFIG_CODEC == SWCODEC */ | 56 | #endif /* defined(HAVE_FMRADIO_REC) */ |
57 | 57 | ||
58 | #if defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC | 58 | #if defined(HAVE_FMRADIO_REC) |
59 | #define FM_RECORDING_SETTINGS | 59 | #define FM_RECORDING_SETTINGS |
60 | static int fm_recording_settings(void) | 60 | static int fm_recording_settings(void) |
61 | { | 61 | { |
62 | int ret = recording_menu(true); | 62 | int ret = recording_menu(true); |
63 | 63 | ||
64 | #if CONFIG_CODEC != SWCODEC | ||
65 | if (!ret) | ||
66 | { | ||
67 | struct audio_recording_options rec_options; | ||
68 | rec_init_recording_options(&rec_options); | ||
69 | rec_options.rec_source = AUDIO_SRC_LINEIN; | ||
70 | rec_set_recording_options(&rec_options); | ||
71 | } | ||
72 | #endif | ||
73 | |||
74 | return ret; | 64 | return ret; |
75 | } | 65 | } |
76 | 66 | ||
77 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), | 67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), |
78 | fm_recording_settings, NULL, NULL, Icon_Recording); | 68 | fm_recording_settings, NULL, NULL, Icon_Recording); |
79 | #endif /* defined(HAVE_FMRADIO_REC) || CONFIG_CODEC != SWCODEC */ | 69 | #endif /* defined(HAVE_FMRADIO_REC) */ |
80 | #endif /* HAVE_RECORDING */ | 70 | #endif /* HAVE_RECORDING */ |
81 | 71 | ||
82 | #ifndef FM_PRESET | 72 | #ifndef FM_PRESET |