From cd25e8b7c91c852209b7277029c36de12c96c473 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Aug 2012 16:27:40 +0200 Subject: [PATCH] (Filebrowser) Cleanups --- console/fileio/file_browser.c | 12 ------------ console/fileio/file_browser.h | 2 -- xbox1/frontend/menu.cpp | 4 ---- 3 files changed, 18 deletions(-) diff --git a/console/fileio/file_browser.c b/console/fileio/file_browser.c index 0651456633..30e43d5bc8 100644 --- a/console/fileio/file_browser.c +++ b/console/fileio/file_browser.c @@ -182,22 +182,10 @@ bool filebrowser_iterate(filebrowser_t *filebrowser, filebrowser_action_t action else filebrowser->current_dir.ptr -= entries_to_scroll; break; - case FILEBROWSER_ACTION_SCROLL_UP_SMOOTH: - if (filebrowser->current_dir.ptr <= 50) - filebrowser->current_dir.ptr= 0; - else - filebrowser->current_dir.ptr -= 50; - break; case FILEBROWSER_ACTION_SCROLL_DOWN: filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + entries_to_scroll, filebrowser->current_dir.list->size-1)); break; - case FILEBROWSER_ACTION_SCROLL_DOWN_SMOOTH: - filebrowser->current_dir.ptr = (min(filebrowser->current_dir.ptr + 50, - filebrowser->current_dir.list->size-1)); - if(!filebrowser->current_dir.ptr) - filebrowser->current_dir.ptr = 0; - break; case FILEBROWSER_ACTION_OK: ret = filebrowser_push_directory(filebrowser, filebrowser_get_current_path(filebrowser), true); break; diff --git a/console/fileio/file_browser.h b/console/fileio/file_browser.h index e4c4dcb05f..8873d8e829 100644 --- a/console/fileio/file_browser.h +++ b/console/fileio/file_browser.h @@ -44,9 +44,7 @@ typedef enum FILEBROWSER_ACTION_OK, FILEBROWSER_ACTION_CANCEL, FILEBROWSER_ACTION_SCROLL_UP, - FILEBROWSER_ACTION_SCROLL_UP_SMOOTH, FILEBROWSER_ACTION_SCROLL_DOWN, - FILEBROWSER_ACTION_SCROLL_DOWN_SMOOTH, FILEBROWSER_ACTION_RESET, FILEBROWSER_ACTION_NOOP } filebrowser_action_t; diff --git a/xbox1/frontend/menu.cpp b/xbox1/frontend/menu.cpp index cba0d4e0fb..bb51220c01 100644 --- a/xbox1/frontend/menu.cpp +++ b/xbox1/frontend/menu.cpp @@ -101,10 +101,6 @@ static void browser_update(filebrowser_t * b, uint16_t input, const char *extens action = FILEBROWSER_ACTION_LEFT; else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_R)) action = FILEBROWSER_ACTION_SCROLL_DOWN; - else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_R2)) - action = FILEBROWSER_ACTION_SCROLL_DOWN_SMOOTH; - else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_L2)) - action = FILEBROWSER_ACTION_SCROLL_UP_SMOOTH; else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_L)) action = FILEBROWSER_ACTION_SCROLL_UP; else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_A))