From 701e262d3d622898279167ba909da631ac460bc1 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 30 Nov 2022 14:50:18 +0000 Subject: 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 --- apps/plugins/lib/playback_control.c | 6 +++--- apps/plugins/rockboy/menu.c | 2 +- apps/plugins/xworld/sys.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins') 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) static bool volume(void) { const struct settings_list* vol = - rb->find_setting(&rb->global_settings->volume, NULL); + rb->find_setting(&rb->global_settings->volume); return rb->option_screen((struct settings_list*)vol, parentvp, false, "Volume"); } static bool shuffle(void) { const struct settings_list* shuffle = - rb->find_setting(&rb->global_settings->playlist_shuffle, NULL); + rb->find_setting(&rb->global_settings->playlist_shuffle); return rb->option_screen((struct settings_list*)shuffle, parentvp, false, "Shuffle"); } static bool repeat_mode(void) { const struct settings_list* repeat = - rb->find_setting(&rb->global_settings->repeat_mode, NULL); + rb->find_setting(&rb->global_settings->repeat_mode); int old_repeat = rb->global_settings->repeat_mode; 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) options.dirty=1; /* Assume that the settings have been changed */ struct viewport *parentvp = NULL; - const struct settings_list* vol = rb->find_setting(&rb->global_settings->volume, NULL); + const struct settings_list* vol = rb->find_setting(&rb->global_settings->volume); while(!done) { 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) case 2: { const struct settings_list* vol = - rb->find_setting(&rb->global_settings->volume, NULL); + rb->find_setting(&rb->global_settings->volume); rb->option_screen((struct settings_list*)vol, NULL, false, "Volume"); break; } -- cgit v1.2.3