From d5a081cbd1b871baf4e5d2c276fbabbc30c7994b Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 19 Sep 2022 12:48:15 +0100 Subject: gui: Remove "enum list_wrap" from list action functions Removing the "list_wrap" argument is actually pretty easy. In practice, almost all lists are using LIST_WRAP_UNLESS_HELD behavior so we can make that the default. A couple of lists disable wraparound with LIST_WRAP_OFF; this is now achieved by setting the list "wraparound" flag to false when setting up the list. LIST_WRAP_ON was unused and is of questionable value, so it has been removed entirely. This makes list wraparound behavior a property of the list, controlled solely by the "wraparound" flag. The result is a simpler list API and implementation, without changing the behavior of any lists. Change-Id: Ib55d17519e6d92fc95ae17b84ab0aaf4233bcb5a --- apps/screens.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apps/screens.c') diff --git a/apps/screens.c b/apps/screens.c index 24d1fed915..7c5440f50d 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -714,8 +714,7 @@ bool browse_id3(struct mp3entry *id3, int playlist_display_index, int playlist_a gui_synclist_draw(&id3_lists); gui_synclist_speak_item(&id3_lists); while (true) { - if(!list_do_action(CONTEXT_LIST,HZ/2, - &id3_lists, &key,LIST_WRAP_UNLESS_HELD) + if(!list_do_action(CONTEXT_LIST,HZ/2, &id3_lists, &key) && key!=ACTION_NONE && key!=ACTION_UNKNOWN) { if (key == ACTION_STD_OK || key == ACTION_STD_CANCEL) @@ -793,8 +792,7 @@ int view_runtime(void) say_runtime = false; } gui_synclist_draw(&lists); - list_do_action(CONTEXT_STD, HZ, - &lists, &action, LIST_WRAP_UNLESS_HELD); + list_do_action(CONTEXT_STD, HZ, &lists, &action); if(action == ACTION_STD_CANCEL) break; if(action == ACTION_STD_OK) { -- cgit v1.2.3