From 1932e65ddec9795a66d74950ddb2eab770b57de3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 25 Sep 2015 18:46:12 +0200 Subject: [PATCH] Don't use menu_navigation_get_ptr --- menu/cbs/menu_cbs_down.c | 8 +++++--- menu/cbs/menu_cbs_info.c | 6 ++++-- menu/cbs/menu_cbs_up.c | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_down.c b/menu/cbs/menu_cbs_down.c index b711576b1e..a87aaf99c1 100644 --- a/menu/cbs/menu_cbs_down.c +++ b/menu/cbs/menu_cbs_down.c @@ -19,13 +19,15 @@ static int action_bind_down_generic(unsigned type, const char *label) { + size_t scroll_accel = 0; unsigned scroll_speed = 0; - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); - if (!menu_list || !nav) + if (!menu_list) + return -1; + if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel)) return -1; - scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1; + scroll_speed = (max(scroll_accel, 2) - 2) / 4 + 1; if (menu_list_get_size(menu_list) <= 0) return 0; diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c index 44890fd5a0..1e565918c2 100644 --- a/menu/cbs/menu_cbs_info.c +++ b/menu/cbs/menu_cbs_info.c @@ -21,15 +21,17 @@ static int action_info_default(unsigned type, const char *label) { + size_t selection = 0; menu_displaylist_info_t info = {0}; - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); if (!menu_list) return 0; + if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) + return 0; info.list = menu_list->menu_stack; - info.directory_ptr = nav->selection_ptr; + info.directory_ptr = selection; strlcpy(info.label, menu_hash_to_str(MENU_LABEL_INFO_SCREEN), sizeof(info.label)); diff --git a/menu/cbs/menu_cbs_up.c b/menu/cbs/menu_cbs_up.c index 74188a9f45..82553e9c18 100644 --- a/menu/cbs/menu_cbs_up.c +++ b/menu/cbs/menu_cbs_up.c @@ -19,13 +19,15 @@ static int action_bind_up_generic(unsigned type, const char *label) { + size_t scroll_accel = 0; unsigned scroll_speed = 0; - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); if (!menu_list) return -1; + if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel)) + return -1; - scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1; + scroll_speed = (max(scroll_accel, 2) - 2) / 4 + 1; if (menu_list_get_size(menu_list) <= 0) return 0;