Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix red in bc416ff590

Browse source 
Most of it was due to checkwps breaking, the rest was m68k with radios.

Change-Id: I8a00e094e4006a132932f05e6c4ff7db63dfbfc8
This commit is contained in:
Solomon Peachy 2021-04-10 21:04:50 -04:00
parent bc416ff590
commit 6ae2b7140c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/gui/skin_engine/skin_parser.c
View file

@ -61,6 +61,7 @@
#include "skin_engine.h" #include "skin_engine.h"
#include "settings.h" #include "settings.h"
#include "settings_list.h" #include "settings_list.h"
#include "rbpaths.h"
#if CONFIG_TUNER #if CONFIG_TUNER
#include "radio.h" #include "radio.h"
#include "tuner.h" #include "tuner.h"

15
apps/radio/presets.c
View file

@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include "settings.h"
#include "rbpaths.h" #include "rbpaths.h"
#include "general.h" #include "general.h"
#include "radio.h" #include "radio.h"
@ -110,7 +111,7 @@ static int find_closest_preset(int freq, int direction)
int f = presets[i].frequency; int f = presets[i].frequency;
if (f == freq) if (f == freq)
return i; /* Exact match = stop */ return i; /* Exact match = stop */
/* remember the highest and lowest presets for wraparound */ /* remember the highest and lowest presets for wraparound */
if (f < presets[lowpreset].frequency) if (f < presets[lowpreset].frequency)
lowpreset = i; lowpreset = i;
@ -223,7 +224,7 @@ void radio_load_presets(char *filename)
return; return;
} }
/* Temporary preset, loaded until player shuts down. */ /* Temporary preset, loaded until player shuts down. */
else if(filename[0] == '/') else if(filename[0] == '/')
strlcpy(filepreset, filename, sizeof(filepreset)); strlcpy(filepreset, filename, sizeof(filepreset));
/* Preset from default directory. */ /* Preset from default directory. */
else else
@ -361,7 +362,7 @@ int preset_list_load(void)
int preset_list_save(void) int preset_list_save(void)
{ {
if(num_presets > 0) if(num_presets > 0)
{ {
bool bad_file_name = true; bool bad_file_name = true;
if(!dir_exists(FMPRESET_PATH)) /* Check if there is preset folder */ if(!dir_exists(FMPRESET_PATH)) /* Check if there is preset folder */
@ -426,11 +427,11 @@ int preset_list_clear(void)
return true; return true;
} }
MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL,
ID2P(LANG_FM_EDIT_PRESET), ID2P(LANG_FM_EDIT_PRESET),
radio_edit_preset, NULL, NULL, Icon_NOICON); radio_edit_preset, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, 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); radio_delete_preset, NULL, NULL, Icon_NOICON);
static int radio_preset_callback(int action, static int radio_preset_callback(int action,
const struct menu_item_ex *this_item, const struct menu_item_ex *this_item,
@ -443,7 +444,7 @@ static int radio_preset_callback(int action,
(void)this_list; (void)this_list;
} }
MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_PRESET), 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); &radio_delete_preset_item);
/* present a list of preset stations */ /* present a list of preset stations */
static const char* presets_get_name(int selected_item, void *data, static const char* presets_get_name(int selected_item, void *data,