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

Replaced autoFavorites with firstPlaylist parameter. Also items in attractModeSkipPlaylist are no longer saved in the lastplayed playlist to prevent settings from appearing in there.

Browse Source
This commit is contained in:
Pieter Hulshoff
2019-04-20 19:08:21 +02:00
parent 1cdd206b0c
commit 19417ac2f9
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
RetroFE/Source/RetroFE.cpp
View File

@@ -433,17 +433,9 @@ void RetroFE::run( )
currentPage_->pushCollection(info); currentPage_->pushCollection(info);
bool autoFavorites = true; std::string firstPlaylist = "all";
config_.getProperty( "autoFavorites", autoFavorites ); config_.getProperty( "firstPlaylist", firstPlaylist );
currentPage_->selectPlaylist( firstPlaylist );
if (autoFavorites)
{
currentPage_->selectPlaylist("favorites"); // Switch to favorites playlist
}
else
{
currentPage_->selectPlaylist("all"); // Switch to all games playlist
}
currentPage_->onNewItemSelected( ); currentPage_->onNewItemSelected( );
currentPage_->reallocateMenuSpritePoints( ); currentPage_->reallocateMenuSpritePoints( );
@@ -611,20 +603,17 @@ void RetroFE::run( )
bool rememberMenu = false; bool rememberMenu = false;
config_.getProperty( "rememberMenu", rememberMenu ); config_.getProperty( "rememberMenu", rememberMenu );
bool autoFavorites = true;
config_.getProperty( "autoFavorites", autoFavorites ); std::string firstPlaylist = "all";
config_.getProperty( "firstPlaylist", firstPlaylist );
if (rememberMenu && lastMenuPlaylists_.find( nextPageName ) != lastMenuPlaylists_.end( )) if (rememberMenu && lastMenuPlaylists_.find( nextPageName ) != lastMenuPlaylists_.end( ))
{ {
currentPage_->selectPlaylist( lastMenuPlaylists_[nextPageName] ); // Switch to last playlist currentPage_->selectPlaylist( lastMenuPlaylists_[nextPageName] ); // Switch to last playlist
}
else if (autoFavorites)
{
currentPage_->selectPlaylist( "favorites" ); // Switch to favorites playlist
} }
else else
{ {
currentPage_->selectPlaylist( "all" ); // Switch to all games playlist currentPage_->selectPlaylist( firstPlaylist );
} }
if ( rememberMenu && lastMenuOffsets_.find( nextPageName ) != lastMenuOffsets_.end( ) ) if ( rememberMenu && lastMenuOffsets_.find( nextPageName ) != lastMenuOffsets_.end( ) )
@@ -702,7 +691,10 @@ void RetroFE::run( )
nextPageItem_ = currentPage_->getSelectedItem( ); nextPageItem_ = currentPage_->getSelectedItem( );
launchEnter( ); launchEnter( );
CollectionInfoBuilder cib(config_, *metadb_); CollectionInfoBuilder cib(config_, *metadb_);
cib.updateLastPlayedPlaylist( currentPage_->getCollection(), nextPageItem_ ); std::string attractModeSkipPlaylist = "";
config_.getProperty( "attractModeSkipPlaylist", attractModeSkipPlaylist );
if (currentPage_->getPlaylistName( ) != attractModeSkipPlaylist)
cib.updateLastPlayedPlaylist( currentPage_->getCollection(), nextPageItem_ ); // Update last played playlist if not currently in the skip playlist (e.g. settings)
l.run(nextPageItem_->collectionInfo->name, nextPageItem_); l.run(nextPageItem_->collectionInfo->name, nextPageItem_);
launchExit( ); launchExit( );
currentPage_->exitGame( ); currentPage_->exitGame( );

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 = "32"; std::string retrofe_version_build = "33";
std::string Version::getString( ) std::string Version::getString( )