diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2021-04-10 21:04:50 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-10 21:06:41 -0400 |
| commit | 6ae2b7140cb258b5df2a3d12f5e7f25234524d62 (patch) | |
| tree | fae11d1331503a288eb5ce364de1ba0a0b24b5c3 | |
| parent | bc416ff5905cd5b0707097971bb9a09f5961a8ae (diff) | |
| download | rockbox-6ae2b7140cb258b5df2a3d12f5e7f25234524d62.tar.gz rockbox-6ae2b7140cb258b5df2a3d12f5e7f25234524d62.zip | |
Fix red in bc416ff590
Most of it was due to checkwps breaking, the rest was m68k with radios.
Change-Id: I8a00e094e4006a132932f05e6c4ff7db63dfbfc8
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
| -rw-r--r-- | apps/radio/presets.c | 15 |
2 files changed, 9 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 80f3800ade..7f3f4d62e1 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -61,6 +61,7 @@ #include "skin_engine.h" #include "settings.h" #include "settings_list.h" +#include "rbpaths.h" #if CONFIG_TUNER #include "radio.h" #include "tuner.h" diff --git a/apps/radio/presets.c b/apps/radio/presets.c index f7531d8754..51bdabdfce 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdbool.h> #include <stdlib.h> +#include "settings.h" #include "rbpaths.h" #include "general.h" #include "radio.h" @@ -110,7 +111,7 @@ static int find_closest_preset(int freq, int direction) int f = presets[i].frequency; if (f == freq) return i; /* Exact match = stop */ - + /* remember the highest and lowest presets for wraparound */ if (f < presets[lowpreset].frequency) lowpreset = i; @@ -223,7 +224,7 @@ void radio_load_presets(char *filename) return; } /* Temporary preset, loaded until player shuts down. */ - else if(filename[0] == '/') + else if(filename[0] == '/') strlcpy(filepreset, filename, sizeof(filepreset)); /* Preset from default directory. */ else @@ -361,7 +362,7 @@ int preset_list_load(void) int preset_list_save(void) { if(num_presets > 0) - { + { bool bad_file_name = true; if(!dir_exists(FMPRESET_PATH)) /* Check if there is preset folder */ @@ -426,11 +427,11 @@ int preset_list_clear(void) return true; } -MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, - ID2P(LANG_FM_EDIT_PRESET), +MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, + ID2P(LANG_FM_EDIT_PRESET), radio_edit_preset, NULL, NULL, Icon_NOICON); MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, - ID2P(LANG_FM_DELETE_PRESET), + ID2P(LANG_FM_DELETE_PRESET), radio_delete_preset, NULL, NULL, Icon_NOICON); static int radio_preset_callback(int action, const struct menu_item_ex *this_item, @@ -443,7 +444,7 @@ static int radio_preset_callback(int action, (void)this_list; } MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_PRESET), - radio_preset_callback, Icon_NOICON, &radio_edit_preset_item, + radio_preset_callback, Icon_NOICON, &radio_edit_preset_item, &radio_delete_preset_item); /* present a list of preset stations */ static const char* presets_get_name(int selected_item, void *data, |