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/playlist_viewer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apps/playlist_viewer.c') diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 2f23d87c2b..d2774e67b0 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c @@ -844,8 +844,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename) } /* Timeout so we can determine if play status has changed */ - bool res = list_do_action(CONTEXT_TREE, HZ/2, - &playlist_lists, &button, LIST_WRAP_UNLESS_HELD); + bool res = list_do_action(CONTEXT_TREE, HZ/2, &playlist_lists, &button); /* during moving, another redraw is going to be needed, * since viewer.selected_track is updated too late (after the first draw) * drawing the moving item needs it */ @@ -1131,8 +1130,7 @@ bool search_playlist(void) gui_synclist_speak_item(&playlist_lists); while (!exit) { - if (list_do_action(CONTEXT_LIST, HZ/4, - &playlist_lists, &button, LIST_WRAP_UNLESS_HELD)) + if (list_do_action(CONTEXT_LIST, HZ/4, &playlist_lists, &button)) continue; switch (button) { -- cgit v1.2.3