@@ -130,12 +130,11 @@ void GameHandler::InitMetaDataMap(QString GameType)
130130 }
131131
132132 if (romDB.count () == 0 )
133- VERBOSE (VB_GENERAL, LOC_ERR + QString (" No romDB data read from "
134- " database for gametype %1 . Not imported?" ).arg (GameType));
133+ LOG (VB_GENERAL, LOG_ERR, LOC + QString (" No romDB data read from "
134+ " database for gametype %1 . Not imported?" ).arg (GameType));
135135 else
136- VERBOSE (VB_GENERAL, LOC + QString (" Loaded %1 items from romDB Database" )
137- .arg (romDB.count ()));
138-
136+ LOG (VB_GENERAL, LOG_INFO, LOC +
137+ QString (" Loaded %1 items from romDB Database" ) .arg (romDB.count ()));
139138}
140139
141140void GameHandler::GetMetadata (GameHandler *handler, QString rom, QString* Genre, QString* Year,
@@ -148,7 +147,9 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,
148147
149148 *CRC32 = crcinfo (rom, handler->GameType (), &key, &romDB);
150149
151- // VERBOSE(VB_IMPORTANT, "Key = " + key);
150+ #if 0
151+ LOG(VB_GENERAL, LOG_DEBUG, "Key = " + key);
152+ #endif
152153
153154 // Set our default values
154155 *Year = QObject::tr (" 19xx" );
@@ -165,7 +166,7 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,
165166 {
166167 if (romDB.contains (key))
167168 {
168- VERBOSE (VB_GENERAL, LOC + QString (" ROMDB FOUND for %1 - %2" )
169+ LOG (VB_GENERAL, LOG_INFO , LOC + QString (" ROMDB FOUND for %1 - %2" )
169170 .arg (romDB[key].GameName ()).arg (key));
170171 *Year = romDB[key].Year ();
171172 *Country = romDB[key].Country ();
@@ -176,7 +177,7 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,
176177 }
177178 else
178179 {
179- VERBOSE (VB_GENERAL, LOC + QString (" NO ROMDB FOUND for %1 (%2)" )
180+ LOG (VB_GENERAL, LOG_ERR , LOC + QString (" NO ROMDB FOUND for %1 (%2)" )
180181 .arg (rom).arg (*CRC32));
181182 }
182183
@@ -189,7 +190,7 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,
189190
190191static void purgeGameDB (QString filename, QString RomPath)
191192{
192- VERBOSE (VB_GENERAL, LOC + QString (" Purging %1 - %2" ).arg (RomPath)
193+ LOG (VB_GENERAL, LOG_INFO , LOC + QString (" Purging %1 - %2" ).arg (RomPath)
193194 .arg (filename));
194195
195196 MSqlQuery query (MSqlQuery::InitCon ());
@@ -299,7 +300,8 @@ static void UpdateGameCounts(QStringList updatelist)
299300 {
300301 diskcount = 0 ;
301302 QString GameType = *it;
302- VERBOSE (VB_GENERAL, LOC + QString (" Update gametype %1" ).arg (GameType));
303+ LOG (VB_GENERAL, LOG_NOTICE,
304+ LOC + QString (" Update gametype %1" ).arg (GameType));
303305
304306 query.prepare (" SELECT romname,system,spandisks,gamename FROM "
305307 " gamemetadata,gameplayers WHERE "
@@ -440,8 +442,11 @@ void GameHandler::UpdateGameDB(GameHandler *handler)
440442 else
441443 ScreenShot.clear ();
442444
443- // VERBOSE(VB_GENERAL, QString("file %1 - genre %2 ").arg(iter.data().Rom()).arg(Genre));
444- // VERBOSE(VB_GENERAL, QString("screenshot %1").arg(ScreenShot));
445+ #if 0
446+ LOG(VB_GENERAL, LOG_INFO, QString("file %1 - genre %2 ")
447+ .arg(iter.data().Rom()).arg(Genre));
448+ LOG(VB_GENERAL, LOG_INFO, QString("screenshot %1").arg(ScreenShot));
449+ #endif
445450
446451 query.prepare (" INSERT INTO gamemetadata "
447452 " (system, romname, gamename, genre, year, gametype, "
@@ -672,7 +677,7 @@ void GameHandler::buildFileList(QString directory, GameHandler *handler,
672677 m_GameMap[RomName] = GameScan (RomName,Info.filePath (),inFileSystem,
673678 GameName, Info.absoluteDir ().path ());
674679
675- VERBOSE (VB_GENERAL, LOC + QString (" Found Rom : (%1) - %2" )
680+ LOG (VB_GENERAL, LOG_INFO , LOC + QString (" Found Rom : (%1) - %2" )
676681 .arg (handler->SystemName ()).arg (RomName));
677682
678683 *filecount = *filecount + 1 ;
@@ -696,8 +701,9 @@ void GameHandler::processGames(GameHandler *handler)
696701 maxcount = buildFileCount (handler->SystemRomPath (),handler);
697702 else
698703 {
699- VERBOSE (VB_GENERAL, LOC_ERR + QString (" Rom Path does not exist: %1" )
700- .arg (handler->SystemRomPath ()));
704+ LOG (VB_GENERAL, LOG_ERR, LOC +
705+ QString (" Rom Path does not exist: %1" )
706+ .arg (handler->SystemRomPath ()));
701707 return ;
702708 }
703709 }
@@ -728,7 +734,8 @@ void GameHandler::processGames(GameHandler *handler)
728734 if (busyDialog)
729735 busyDialog->Close ();
730736
731- VERBOSE (VB_GENERAL, LOC + QString (" PC Game %1" ).arg (handler->SystemName ()));
737+ LOG (VB_GENERAL, LOG_INFO, LOC +
738+ QString (" PC Game %1" ).arg (handler->SystemName ()));
732739 }
733740 else
734741 {
@@ -899,11 +906,12 @@ void GameHandler::Launchgame(RomInfo *romdata, QString systemname)
899906 {
900907 if (!d.cd (handler->SystemWorkingPath ()))
901908 {
902- VERBOSE (VB_GENERAL, LOC_ERR + QString (" Failed to change to specified Working Directory: %1" )
909+ LOG (VB_GENERAL, LOG_ERR, LOC +
910+ QString (" Failed to change to specified Working Directory: %1" )
903911 .arg (handler->SystemWorkingPath ()));
904912 }
905913 }
906- VERBOSE (VB_GENERAL, LOC + QString (" Launching Game : %1 : %2" )
914+ LOG (VB_GENERAL, LOG_INFO , LOC + QString (" Launching Game : %1 : %2" )
907915 .arg (handler->SystemName ())
908916 .arg (exec));
909917
@@ -915,13 +923,14 @@ void GameHandler::Launchgame(RomInfo *romdata, QString systemname)
915923 for (QStringList::Iterator cmd = cmdlist.begin (); cmd != cmdlist.end ();
916924 ++cmd )
917925 {
918- VERBOSE (VB_GENERAL, LOC + QString (" Executing : %1" ).arg (*cmd));
926+ LOG (VB_GENERAL, LOG_INFO, LOC +
927+ QString (" Executing : %1" ).arg (*cmd));
919928 myth_system (*cmd, kMSProcessEvents );
920929 }
921930 }
922931 else
923932 {
924- VERBOSE (VB_GENERAL, LOC + QString (" Executing : %1" ).arg (exec));
933+ LOG (VB_GENERAL, LOG_INFO , LOC + QString (" Executing : %1" ).arg (exec));
925934 myth_system (exec, kMSProcessEvents );
926935 }
927936
0 commit comments