From e577ebd34c2bb1d8677667795d2521d4a73361bf Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Fri, 11 Oct 2019 22:02:23 +0200 Subject: [PATCH] Removed minimum wait time for collectionUp/Down keys. --- RetroFE/Source/RetroFE.cpp | 22 ++++++++++++---------- RetroFE/Source/Version.cpp | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp index b51ea3b..0ada1b1 100644 --- a/RetroFE/Source/RetroFE.cpp +++ b/RetroFE/Source/RetroFE.cpp @@ -1223,6 +1223,18 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput( Page *page ) state = RETROFE_MENUMODE_START_REQUEST; } + // Handle Collection Up/Down keys + if (input_.keystate( UserInput::KeyCodeCollectionUp )) + { + attract_.reset( ); + state = RETROFE_COLLECTION_UP_REQUEST; + } + if (input_.keystate( UserInput::KeyCodeCollectionDown )) + { + attract_.reset( ); + state = RETROFE_COLLECTION_DOWN_REQUEST; + } + if ( menuMode_ || ( !input_.keystate(UserInput::KeyCodePageUp) && !input_.keystate(UserInput::KeyCodePageDown) && @@ -1283,16 +1295,6 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput( Page *page ) page->letterScroll(Page::ScrollDirectionForward); state = RETROFE_MENUJUMP_REQUEST; } - if (input_.keystate( UserInput::KeyCodeCollectionUp )) - { - attract_.reset( ); - state = RETROFE_COLLECTION_UP_REQUEST; - } - if (input_.keystate( UserInput::KeyCodeCollectionDown )) - { - attract_.reset( ); - state = RETROFE_COLLECTION_DOWN_REQUEST; - } if ( input_.newKeyPressed(UserInput::KeyCodeFavPlaylist) ) { attract_.reset( ); diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index ae5d387..04ee8f4 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -21,7 +21,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "9"; -std::string retrofe_version_build = "4"; +std::string retrofe_version_build = "5"; std::string Version::getString( )