funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-09-16 12:13:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset playlist attract mode timer when attract mode is first entered.

Browse Source
This commit is contained in:
Pieter Hulshoff
2019-04-17 23:31:49 +02:00
parent 2f5bfed9e9
commit fdd1a10d6e
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
RetroFE/Source/Execute/AttractMode.cpp
View File

@@ -29,13 +29,13 @@ AttractMode::AttractMode()
{ {
} }
void AttractMode::reset( bool set, bool resetElapsedPlaylistTime ) void AttractMode::reset( bool set )
{ {
elapsedTime_ = 0; elapsedTime_ = 0;
isActive_ = false; isActive_ = false;
isSet_ = set; isSet_ = set;
activeTime_ = 0; activeTime_ = 0;
if (resetElapsedPlaylistTime) if (!set)
elapsedPlaylistTime_ = 0; elapsedPlaylistTime_ = 0;
} }
@@ -47,12 +47,17 @@ bool AttractMode::update(float dt, Page &page)
// Check if it's time to switch playlists // Check if it's time to switch playlists
if (!isActive_ && elapsedPlaylistTime_ > idlePlaylistTime && idlePlaylistTime > 0) if (!isActive_ && elapsedPlaylistTime_ > idlePlaylistTime && idlePlaylistTime > 0)
{
elapsedPlaylistTime_ = 0;
return true; return true;
}
// enable attract mode when idling for the expected time. Disable if idle time is set to 0. // enable attract mode when idling for the expected time. Disable if idle time is set to 0.
if(!isActive_ && ((elapsedTime_ > idleTime && idleTime > 0) || (isSet_ && elapsedTime_ > idleNextTime && idleNextTime > 0))) if(!isActive_ && ((elapsedTime_ > idleTime && idleTime > 0) || (isSet_ && elapsedTime_ > idleNextTime && idleNextTime > 0)))
{ {
if (!isSet_)
elapsedPlaylistTime_ = 0; // Reset playlist timer if we are entering attract mode
isActive_ = true; isActive_ = true;
isSet_ = true; isSet_ = true;
elapsedTime_ = 0; elapsedTime_ = 0;

2
RetroFE/Source/Execute/AttractMode.h
View File

@@ -21,7 +21,7 @@ class AttractMode
{ {
public: public:
AttractMode(); AttractMode();
void reset( bool set = false, bool resetElapsedPlaylistTime = true ); void reset( bool set = false );
bool update(float dt, Page &page); bool update(float dt, Page &page);
float idleTime; float idleTime;
float idleNextTime; float idleNextTime;

4
RetroFE/Source/RetroFE.cpp
View File

@@ -893,7 +893,7 @@ void RetroFE::run( )
{ {
if (attract_.update( deltaTime, *currentPage_ )) if (attract_.update( deltaTime, *currentPage_ ))
{ {
attract_.reset( attract_.isSet( ), true ); attract_.reset( attract_.isSet( ) );
currentPage_->nextPlaylist( ); currentPage_->nextPlaylist( );
std::string attractModeSkipPlaylist = ""; std::string attractModeSkipPlaylist = "";
config_.getProperty( "attractModeSkipPlaylist", attractModeSkipPlaylist ); config_.getProperty( "attractModeSkipPlaylist", attractModeSkipPlaylist );
@@ -1153,7 +1153,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput( Page *page )
page->resetScrollPeriod( ); page->resetScrollPeriod( );
if (page->isMenuScrolling( )) if (page->isMenuScrolling( ))
{ {
attract_.reset( attract_.isSet( ), false ); attract_.reset( attract_.isSet( ) );
state = RETROFE_HIGHLIGHT_REQUEST; state = RETROFE_HIGHLIGHT_REQUEST;
} }
} }

2
RetroFE/Source/Version.cpp
View File

@@ -21,7 +21,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "8"; std::string retrofe_version_minor = "8";
std::string retrofe_version_build = "29"; std::string retrofe_version_build = "31";
std::string Version::getString( ) std::string Version::getString( )