funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add parameter initInBackground to force init in background thread (but still uses a lot of CPU if game is launched while not finished), and parameter initMetaDb to initialize or not the meta db that takes a lot of time

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2019-11-14 15:16:14 +08:00
parent 8532aa196e
commit f7b831f0ab
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
RetroFE/Source/RetroFE.cpp
View File

@ -57,7 +57,7 @@
#define REMOVE_TEST_FUNKEY #define REMOVE_TEST_FUNKEY
#define FUNKEY_ALL_POLLEVENT_DELAY 30 //ms #define FUNKEY_ALL_POLLEVENT_DELAY 30 //ms
#define PERIOD_FORCE_REFRESH 1000 //ms //#define PERIOD_FORCE_REFRESH 1000 //ms
#define FPS 30 // TODO: set in conf file #define FPS 30 // TODO: set in conf file
@ -72,6 +72,7 @@
RetroFE::RetroFE( Configuration &c ) RetroFE::RetroFE( Configuration &c )
: initialized(false) : initialized(false)
, initializeError(false) , initializeError(false)
, initMetaDb(true)
, initializeThread(NULL) , initializeThread(NULL)
, config_(c) , config_(c)
, db_(NULL) , db_(NULL)
@ -152,6 +153,7 @@ int RetroFE::initialize( void *context )
instance->initializeError = true; instance->initializeError = true;
return -1; return -1;
} }
Logger::write( Logger::ZONE_INFO, "RetroFE", "Initialized user controls" );
instance->db_ = new DB( Utils::combinePath( Configuration::absolutePath, "meta.db" ) ); instance->db_ = new DB( Utils::combinePath( Configuration::absolutePath, "meta.db" ) );
@ -161,14 +163,20 @@ int RetroFE::initialize( void *context )
instance->initializeError = true; instance->initializeError = true;
return -1; return -1;
} }
Logger::write( Logger::ZONE_INFO, "RetroFE", "Initialized database" );
instance->metadb_ = new MetadataDatabase( *(instance->db_), instance->config_ ); instance->metadb_ = new MetadataDatabase( *(instance->db_), instance->config_ );
if ( !instance->metadb_->initialize( ) )
{ if(instance->initMetaDb){
Logger::write( Logger::ZONE_ERROR, "RetroFE", "Could not initialize meta database" ); Logger::write( Logger::ZONE_INFO, "RetroFE", "Initializing meta database..." );
instance->initializeError = true; if ( !instance->metadb_->initialize( ) )
return -1; {
Logger::write( Logger::ZONE_ERROR, "RetroFE", "Could not initialize meta database" );
instance->initializeError = true;
return -1;
}
Logger::write( Logger::ZONE_INFO, "RetroFE", "Initialized meta database" );
} }
instance->initialized = true; instance->initialized = true;
@ -457,7 +465,10 @@ void RetroFE::run( )
VideoFactory::createVideo( ); // pre-initialize the gstreamer engine VideoFactory::createVideo( ); // pre-initialize the gstreamer engine
Video::setEnabled( videoEnable ); Video::setEnabled( videoEnable );
//initializeThread = SDL_CreateThread( initialize, "RetroFEInit", (void *)this ); // Init thread
bool initMetaDbtmp;
config_.getProperty( "initMetaDb", initMetaDbtmp );
initMetaDb = initMetaDbtmp;
initializeThread = SDL_CreateThread( initialize, (void *)this ); initializeThread = SDL_CreateThread( initialize, (void *)this );
if ( !initializeThread ) if ( !initializeThread )
@ -469,6 +480,8 @@ void RetroFE::run( )
int attractModeTime = 0; int attractModeTime = 0;
std::string firstCollection = "Main"; std::string firstCollection = "Main";
bool running = true; bool running = true;
bool initInBackground = false;
config_.getProperty( "initInBackground", initInBackground );
RETROFE_STATE state = RETROFE_NEW; RETROFE_STATE state = RETROFE_NEW;
config_.getProperty( "attractModeTime", attractModeTime ); config_.getProperty( "attractModeTime", attractModeTime );
@ -548,9 +561,13 @@ void RetroFE::run( )
} }
// Handle end of splash mode // Handle end of splash mode
if ( (initialized || initializeError) && splashMode && (exitSplashMode || (currentPage_->getMinShowTime( ) <= (currentTime_ - preloadTime) && !(currentPage_->isPlaying( )))) ) if ( ( (initialized || initializeError) && splashMode && (exitSplashMode || (currentPage_->getMinShowTime( ) <= (currentTime_ - preloadTime) && !(currentPage_->isPlaying( )))) )
|| (initInBackground && splashMode) )
{ {
SDL_WaitThread( initializeThread, &initializeStatus ); if(!initInBackground){
SDL_WaitThread( initializeThread, &initializeStatus );
printf("SDL_WaitThread finisheds\n");
}
if ( initializeError ) if ( initializeError )
{ {
@ -1097,7 +1114,10 @@ void RetroFE::run( )
// ------- Real render here ------- // ------- Real render here -------
if(must_render){ if(must_render){
render( ); render( );
#ifdef PERIOD_FORCE_REFRESH
ticks_last_refresh = SDL_GetTicks(); ticks_last_refresh = SDL_GetTicks();
#endif //PERIOD_FORCE_REFRESH
akes a lot of time
} }
} }
} }
@ -1470,12 +1490,12 @@ CollectionInfo *RetroFE::getCollection(std::string collectionName)
{ {
std::string::size_type firstPos = (*itI)->title.find_first_of( "(" ); std::string::size_type firstPos = (*itI)->title.find_first_of( "(" );
std::string::size_type secondPos = (*itI)->title.find_first_of( ")", firstPos ); std::string::size_type secondPos = (*itI)->title.find_first_of( ")", firstPos );
while ( firstPos != std::string::npos && secondPos != std::string::npos ) while ( firstPos != std::string::npos && secondPos != std::string::npos )
{ {
firstPos = (*itI)->title.find_first_of( "(" ); firstPos = (*itI)->title.find_first_of( "(" );
secondPos = (*itI)->title.find_first_of( ")", firstPos ); secondPos = (*itI)->title.find_first_of( ")", firstPos );
if ( firstPos != std::string::npos ) if ( firstPos != std::string::npos )
{ {
(*itI)->title.erase( firstPos, (secondPos - firstPos) + 1 ); (*itI)->title.erase( firstPos, (secondPos - firstPos) + 1 );
@ -1486,12 +1506,12 @@ CollectionInfo *RetroFE::getCollection(std::string collectionName)
{ {
std::string::size_type firstPos = (*itI)->title.find_first_of( "[" ); std::string::size_type firstPos = (*itI)->title.find_first_of( "[" );
std::string::size_type secondPos = (*itI)->title.find_first_of( "]", firstPos ); std::string::size_type secondPos = (*itI)->title.find_first_of( "]", firstPos );
while ( firstPos != std::string::npos && secondPos != std::string::npos ) while ( firstPos != std::string::npos && secondPos != std::string::npos )
{ {
firstPos = (*itI)->title.find_first_of( "[" ); firstPos = (*itI)->title.find_first_of( "[" );
secondPos = (*itI)->title.find_first_of( "]", firstPos ); secondPos = (*itI)->title.find_first_of( "]", firstPos );
if ( firstPos != std::string::npos && secondPos != std::string::npos ) if ( firstPos != std::string::npos && secondPos != std::string::npos )
{ {
(*itI)->title.erase( firstPos, (secondPos - firstPos) + 1 ); (*itI)->title.erase( firstPos, (secondPos - firstPos) + 1 );

1
RetroFE/Source/RetroFE.h
View File

@ -53,6 +53,7 @@ public:
private: private:
volatile bool initialized; volatile bool initialized;
volatile bool initializeError; volatile bool initializeError;
volatile bool initMetaDb;
SDL_Thread *initializeThread; SDL_Thread *initializeThread;
static int initialize( void *context ); static int initialize( void *context );