summaryrefslogtreecommitdiff
path: root/apps/menu.c
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/menu.c
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/menu.c')
-rw-r--r--apps/menu.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/menu.c b/apps/menu.c
index f317f579a4..df2284be12 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -147,7 +147,7 @@ static const char* get_menu_item_name(int selected_item,
147 type = (menu->flags&MENU_TYPE_MASK); 147 type = (menu->flags&MENU_TYPE_MASK);
148 if ((type == MT_SETTING) || (type == MT_SETTING_W_TEXT)) 148 if ((type == MT_SETTING) || (type == MT_SETTING_W_TEXT))
149 { 149 {
150 const struct settings_list *v = find_setting(menu->variable, NULL); 150 const struct settings_list *v = find_setting(menu->variable);
151 if (v) 151 if (v)
152 return str(v->lang_id); 152 return str(v->lang_id);
153 else return "Not Done yet!"; 153 else return "Not Done yet!";
@@ -356,14 +356,12 @@ void do_setting_from_menu(const struct menu_item_ex *temp,
356 struct viewport parent[NB_SCREENS]) 356 struct viewport parent[NB_SCREENS])
357{ 357{
358 char *title; 358 char *title;
359 int setting_id;
360 if (!temp) 359 if (!temp)
361 { 360 {
362 panicf("do_setting_from_menu, NULL pointer"); 361 panicf("do_setting_from_menu, NULL pointer");
363 return; 362 return;
364 } 363 }
365 const struct settings_list *setting = 364 const struct settings_list *setting = find_setting(temp->variable);
366 find_setting(temp->variable, &setting_id);
367 365
368 if ((temp->flags&MENU_TYPE_MASK) == MT_SETTING_W_TEXT) 366 if ((temp->flags&MENU_TYPE_MASK) == MT_SETTING_W_TEXT)
369 title = temp->callback_and_desc->desc; 367 title = temp->callback_and_desc->desc;
@@ -523,7 +521,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
523 ID2P(LANG_RESET_SETTING)); 521 ID2P(LANG_RESET_SETTING));
524 const struct menu_item_ex *context_menu; 522 const struct menu_item_ex *context_menu;
525 const struct settings_list *setting = 523 const struct settings_list *setting =
526 find_setting(temp->variable, NULL); 524 find_setting(temp->variable);
527#ifdef HAVE_QUICKSCREEN 525#ifdef HAVE_QUICKSCREEN
528 if (is_setting_quickscreenable(setting)) 526 if (is_setting_quickscreenable(setting))
529 context_menu = &quickscreen_able_option; 527 context_menu = &quickscreen_able_option;