summaryrefslogtreecommitdiff
path: root/apps/screens.c
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-09-19 12:48:15 +0100
committerAidan MacDonald <amachronic@protonmail.com>2022-10-05 11:22:55 -0400
commitd5a081cbd1b871baf4e5d2c276fbabbc30c7994b (patch)
treeaac3c9377be8433ad15c4ca2a733d3a7c81aad97 /apps/screens.c
parentff378deb69951a53b866f3d3c6ee13022e520436 (diff)
downloadrockbox-d5a081cbd1b871baf4e5d2c276fbabbc30c7994b.tar.gz
rockbox-d5a081cbd1b871baf4e5d2c276fbabbc30c7994b.zip
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
Diffstat (limited to 'apps/screens.c')
-rw-r--r--apps/screens.c6
1 files changed, 2 insertions, 4 deletions
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
714 gui_synclist_draw(&id3_lists); 714 gui_synclist_draw(&id3_lists);
715 gui_synclist_speak_item(&id3_lists); 715 gui_synclist_speak_item(&id3_lists);
716 while (true) { 716 while (true) {
717 if(!list_do_action(CONTEXT_LIST,HZ/2, 717 if(!list_do_action(CONTEXT_LIST,HZ/2, &id3_lists, &key)
718 &id3_lists, &key,LIST_WRAP_UNLESS_HELD)
719 && key!=ACTION_NONE && key!=ACTION_UNKNOWN) 718 && key!=ACTION_NONE && key!=ACTION_UNKNOWN)
720 { 719 {
721 if (key == ACTION_STD_OK || key == ACTION_STD_CANCEL) 720 if (key == ACTION_STD_OK || key == ACTION_STD_CANCEL)
@@ -793,8 +792,7 @@ int view_runtime(void)
793 say_runtime = false; 792 say_runtime = false;
794 } 793 }
795 gui_synclist_draw(&lists); 794 gui_synclist_draw(&lists);
796 list_do_action(CONTEXT_STD, HZ, 795 list_do_action(CONTEXT_STD, HZ, &lists, &action);
797 &lists, &action, LIST_WRAP_UNLESS_HELD);
798 if(action == ACTION_STD_CANCEL) 796 if(action == ACTION_STD_CANCEL)
799 break; 797 break;
800 if(action == ACTION_STD_OK) { 798 if(action == ACTION_STD_OK) {