summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-11-30 14:50:18 +0000
committerAidan MacDonald <amachronic@protonmail.com>2022-12-17 13:36:38 +0000
commit701e262d3d622898279167ba909da631ac460bc1 (patch)
tree763be2f80bd12dde2b6c743a023ad331959d891b /apps/gui
parent767ddef550ec193c087064291b78d0e1db5e8fb0 (diff)
downloadrockbox-701e262d3d622898279167ba909da631ac460bc1.tar.gz
rockbox-701e262d3d622898279167ba909da631ac460bc1.zip
settings: Remove setting ID return from find_setting()
Now that all users have replaced setting IDs with direct pointers, find_setting() and friends don't need to return an ID value. Change-Id: I8c5c31bb68d3bca5350d43538335265a55fd5517
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/skin_engine/skin_parser.c6
-rw-r--r--apps/gui/skin_engine/skin_touchsupport.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 435bad9e1f..ad5fa48756 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -823,7 +823,7 @@ static int parse_setting_and_lang(struct skin_element *element,
823 else 823 else
824 { 824 {
825#ifndef __PCTOOL__ 825#ifndef __PCTOOL__
826 const struct settings_list *setting = find_setting_by_cfgname(temp, NULL); 826 const struct settings_list *setting = find_setting_by_cfgname(temp);
827 if (!setting) 827 if (!setting)
828 return WPS_ERROR_INVALID_PARAM; 828 return WPS_ERROR_INVALID_PARAM;
829 829
@@ -1158,7 +1158,7 @@ static int parse_progressbar_tag(struct skin_element* element,
1158 param++; 1158 param++;
1159 text = SKINOFFSETTOPTR(skin_buffer, param->data.text); 1159 text = SKINOFFSETTOPTR(skin_buffer, param->data.text);
1160#ifndef __PCTOOL__ 1160#ifndef __PCTOOL__
1161 pb->setting = find_setting_by_cfgname(text, NULL); 1161 pb->setting = find_setting_by_cfgname(text);
1162 if (!pb->setting) 1162 if (!pb->setting)
1163 return WPS_ERROR_INVALID_PARAM; 1163 return WPS_ERROR_INVALID_PARAM;
1164#endif 1164#endif
@@ -1548,7 +1548,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
1548#ifndef __PCTOOL__ 1548#ifndef __PCTOOL__
1549 int p = param_no; 1549 int p = param_no;
1550 char *name = get_param_text(element, p++); 1550 char *name = get_param_text(element, p++);
1551 const struct settings_list *setting = find_setting_by_cfgname(name, NULL); 1551 const struct settings_list *setting = find_setting_by_cfgname(name);
1552 if (!setting) 1552 if (!setting)
1553 return WPS_ERROR_INVALID_PARAM; 1553 return WPS_ERROR_INVALID_PARAM;
1554 1554
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 27b82e6608..b952709562 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -300,7 +300,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
300 case ACTION_TOUCH_REPMODE: /* cycle the repeat mode setting */ 300 case ACTION_TOUCH_REPMODE: /* cycle the repeat mode setting */
301 { 301 {
302 const struct settings_list *rep_setting = 302 const struct settings_list *rep_setting =
303 find_setting(&global_settings.repeat_mode, NULL); 303 find_setting(&global_settings.repeat_mode);
304 option_select_next_val(rep_setting, false, true); 304 option_select_next_val(rep_setting, false, true);
305 audio_flush_and_reload_tracks(); 305 audio_flush_and_reload_tracks();
306 returncode = ACTION_REDRAW; 306 returncode = ACTION_REDRAW;