summaryrefslogtreecommitdiff
path: root/apps/plugins
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/plugins
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/plugins')
-rw-r--r--apps/plugins/lib/playback_control.c6
-rw-r--r--apps/plugins/rockboy/menu.c2
-rw-r--r--apps/plugins/xworld/sys.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c
index a7f5b8baff..3e97916400 100644
--- a/apps/plugins/lib/playback_control.c
+++ b/apps/plugins/lib/playback_control.c
@@ -65,21 +65,21 @@ static bool nexttrack(void)
65static bool volume(void) 65static bool volume(void)
66{ 66{
67 const struct settings_list* vol = 67 const struct settings_list* vol =
68 rb->find_setting(&rb->global_settings->volume, NULL); 68 rb->find_setting(&rb->global_settings->volume);
69 return rb->option_screen((struct settings_list*)vol, parentvp, false, "Volume"); 69 return rb->option_screen((struct settings_list*)vol, parentvp, false, "Volume");
70} 70}
71 71
72static bool shuffle(void) 72static bool shuffle(void)
73{ 73{
74 const struct settings_list* shuffle = 74 const struct settings_list* shuffle =
75 rb->find_setting(&rb->global_settings->playlist_shuffle, NULL); 75 rb->find_setting(&rb->global_settings->playlist_shuffle);
76 return rb->option_screen((struct settings_list*)shuffle, parentvp, false, "Shuffle"); 76 return rb->option_screen((struct settings_list*)shuffle, parentvp, false, "Shuffle");
77} 77}
78 78
79static bool repeat_mode(void) 79static bool repeat_mode(void)
80{ 80{
81 const struct settings_list* repeat = 81 const struct settings_list* repeat =
82 rb->find_setting(&rb->global_settings->repeat_mode, NULL); 82 rb->find_setting(&rb->global_settings->repeat_mode);
83 int old_repeat = rb->global_settings->repeat_mode; 83 int old_repeat = rb->global_settings->repeat_mode;
84 84
85 rb->option_screen((struct settings_list*)repeat, parentvp, false, "Repeat"); 85 rb->option_screen((struct settings_list*)repeat, parentvp, false, "Repeat");
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index caa8d499cb..7fd7aabdc8 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -428,7 +428,7 @@ static void do_opt_menu(void)
428 options.dirty=1; /* Assume that the settings have been changed */ 428 options.dirty=1; /* Assume that the settings have been changed */
429 429
430 struct viewport *parentvp = NULL; 430 struct viewport *parentvp = NULL;
431 const struct settings_list* vol = rb->find_setting(&rb->global_settings->volume, NULL); 431 const struct settings_list* vol = rb->find_setting(&rb->global_settings->volume);
432 432
433 while(!done) 433 while(!done)
434 { 434 {
diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c
index ece9d87b66..e20322258d 100644
--- a/apps/plugins/xworld/sys.c
+++ b/apps/plugins/xworld/sys.c
@@ -286,7 +286,7 @@ static void do_sound_settings(struct System* sys)
286 case 2: 286 case 2:
287 { 287 {
288 const struct settings_list* vol = 288 const struct settings_list* vol =
289 rb->find_setting(&rb->global_settings->volume, NULL); 289 rb->find_setting(&rb->global_settings->volume);
290 rb->option_screen((struct settings_list*)vol, NULL, false, "Volume"); 290 rb->option_screen((struct settings_list*)vol, NULL, false, "Volume");
291 break; 291 break;
292 } 292 }