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/playback_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/playback_menu.c')
-rw-r--r-- | apps/menus/playback_menu.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index bf770c0f11..41c738725c 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -35,16 +35,13 @@ | |||
35 | #include "audio.h" | 35 | #include "audio.h" |
36 | #include "cuesheet.h" | 36 | #include "cuesheet.h" |
37 | #include "misc.h" | 37 | #include "misc.h" |
38 | #if CONFIG_CODEC == SWCODEC | ||
39 | #include "playback.h" | 38 | #include "playback.h" |
40 | #include "pcm_sampr.h" | 39 | #include "pcm_sampr.h" |
41 | #ifdef HAVE_PLAY_FREQ | 40 | #ifdef HAVE_PLAY_FREQ |
42 | #include "talk.h" | 41 | #include "talk.h" |
43 | #endif | 42 | #endif |
44 | #endif | ||
45 | |||
46 | 43 | ||
47 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) | 44 | #if defined(HAVE_CROSSFADE) |
48 | static int setcrossfadeonexit_callback(int action, | 45 | static int setcrossfadeonexit_callback(int action, |
49 | const struct menu_item_ex *this_item, | 46 | const struct menu_item_ex *this_item, |
50 | struct gui_synclist *this_list) | 47 | struct gui_synclist *this_list) |
@@ -60,7 +57,7 @@ static int setcrossfadeonexit_callback(int action, | |||
60 | return action; | 57 | return action; |
61 | } | 58 | } |
62 | 59 | ||
63 | #endif /* CONFIG_CODEC == SWCODEC */ | 60 | #endif /* HAVE_CROSSFADE */ |
64 | 61 | ||
65 | /***********************************/ | 62 | /***********************************/ |
66 | /* PLAYBACK MENU */ | 63 | /* PLAYBACK MENU */ |
@@ -77,7 +74,6 @@ MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); | |||
77 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, | 74 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, |
78 | &ff_rewind_min_step, &ff_rewind_accel); | 75 | &ff_rewind_min_step, &ff_rewind_accel); |
79 | #ifdef HAVE_DISK_STORAGE | 76 | #ifdef HAVE_DISK_STORAGE |
80 | #if CONFIG_CODEC == SWCODEC | ||
81 | static int buffermargin_callback(int action, | 77 | static int buffermargin_callback(int action, |
82 | const struct menu_item_ex *this_item, | 78 | const struct menu_item_ex *this_item, |
83 | struct gui_synclist *this_list) | 79 | struct gui_synclist *this_list) |
@@ -92,16 +88,12 @@ static int buffermargin_callback(int action, | |||
92 | } | 88 | } |
93 | return action; | 89 | return action; |
94 | } | 90 | } |
95 | #else | ||
96 | # define buffermargin_callback NULL | ||
97 | #endif | ||
98 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, | 91 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, |
99 | buffermargin_callback); | 92 | buffermargin_callback); |
100 | #endif /*HAVE_DISK_STORAGE */ | 93 | #endif /*HAVE_DISK_STORAGE */ |
101 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); | 94 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); |
102 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); | 95 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); |
103 | 96 | ||
104 | #if CONFIG_CODEC == SWCODEC | ||
105 | #ifdef HAVE_CROSSFADE | 97 | #ifdef HAVE_CROSSFADE |
106 | /* crossfade submenu */ | 98 | /* crossfade submenu */ |
107 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); | 99 | MENUITEM_SETTING(crossfade, &global_settings.crossfade, setcrossfadeonexit_callback); |
@@ -150,7 +142,6 @@ MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, | |||
150 | &replaygain_type, &replaygain_noclip, &replaygain_preamp); | 142 | &replaygain_type, &replaygain_noclip, &replaygain_preamp); |
151 | 143 | ||
152 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); | 144 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); |
153 | #endif /* CONFIG_CODEC == SWCODEC */ | ||
154 | 145 | ||
155 | #ifdef HAVE_SPDIF_POWER | 146 | #ifdef HAVE_SPDIF_POWER |
156 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); | 147 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); |
@@ -188,13 +179,7 @@ static int cuesheet_callback(int action, | |||
188 | switch (action) | 179 | switch (action) |
189 | { | 180 | { |
190 | case ACTION_EXIT_MENUITEM: /* on exit */ | 181 | case ACTION_EXIT_MENUITEM: /* on exit */ |
191 | #if CONFIG_CODEC == SWCODEC | ||
192 | audio_set_cuesheet(global_settings.cuesheet); | 182 | audio_set_cuesheet(global_settings.cuesheet); |
193 | #else | ||
194 | if (global_settings.cuesheet) | ||
195 | splash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); | ||
196 | break; | ||
197 | #endif | ||
198 | } | 183 | } |
199 | return action; | 184 | return action; |
200 | } | 185 | } |
@@ -209,9 +194,7 @@ MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON, | |||
209 | 194 | ||
210 | MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL); | 195 | MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL); |
211 | MENUITEM_SETTING(prevent_skip, &global_settings.prevent_skip, NULL); | 196 | MENUITEM_SETTING(prevent_skip, &global_settings.prevent_skip, NULL); |
212 | #if CONFIG_CODEC == SWCODEC | ||
213 | MENUITEM_SETTING(resume_rewind, &global_settings.resume_rewind, NULL); | 197 | MENUITEM_SETTING(resume_rewind, &global_settings.resume_rewind, NULL); |
214 | #endif | ||
215 | MENUITEM_SETTING(pause_rewind, &global_settings.pause_rewind, NULL); | 198 | MENUITEM_SETTING(pause_rewind, &global_settings.pause_rewind, NULL); |
216 | #ifdef HAVE_PLAY_FREQ | 199 | #ifdef HAVE_PLAY_FREQ |
217 | MENUITEM_SETTING(play_frequency, &global_settings.play_frequency, | 200 | MENUITEM_SETTING(play_frequency, &global_settings.play_frequency, |
@@ -227,13 +210,11 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
227 | #endif | 210 | #endif |
228 | &fade_on_stop, &party_mode, | 211 | &fade_on_stop, &party_mode, |
229 | 212 | ||
230 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_CROSSFADE) | 213 | #if defined(HAVE_CROSSFADE) |
231 | &crossfade_settings_menu, | 214 | &crossfade_settings_menu, |
232 | #endif | 215 | #endif |
233 | 216 | ||
234 | #if CONFIG_CODEC == SWCODEC | ||
235 | &replaygain_settings_menu, &beep, | 217 | &replaygain_settings_menu, &beep, |
236 | #endif | ||
237 | 218 | ||
238 | #ifdef HAVE_SPDIF_POWER | 219 | #ifdef HAVE_SPDIF_POWER |
239 | &spdif_enable, | 220 | &spdif_enable, |
@@ -244,9 +225,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
244 | #endif | 225 | #endif |
245 | ,&skip_length, &prevent_skip | 226 | ,&skip_length, &prevent_skip |
246 | 227 | ||
247 | #if CONFIG_CODEC == SWCODEC | ||
248 | ,&resume_rewind | 228 | ,&resume_rewind |
249 | #endif | ||
250 | ,&pause_rewind | 229 | ,&pause_rewind |
251 | #ifdef HAVE_PLAY_FREQ | 230 | #ifdef HAVE_PLAY_FREQ |
252 | ,&play_frequency | 231 | ,&play_frequency |