ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
Thomas Jentzsch 2019-08-14 17:26:02 +02:00
parent d731b71afb 48e9e81747
commit 50cb562592
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/SoundNull.hxx
View File

@ -40,7 +40,7 @@ class SoundNull : public Sound
*/ */
explicit SoundNull(OSystem& osystem) : Sound(osystem) explicit SoundNull(OSystem& osystem) : Sound(osystem)
{ {
Logger::log("Sound disabled.\n", 1); Logger::info("Sound disabled.\n");
} }
/** /**

9
src/common/repository/sqlite/KeyValueRepositorySqlite.cxx
View File

@ -26,7 +26,8 @@ KeyValueRepositorySqlite::KeyValueRepositorySqlite(
const string& tableName const string& tableName
) : myTableName(tableName), ) : myTableName(tableName),
myDb(db) myDb(db)
{} {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
std::map<string, Variant> KeyValueRepositorySqlite::load() std::map<string, Variant> KeyValueRepositorySqlite::load()
@ -42,7 +43,7 @@ std::map<string, Variant> KeyValueRepositorySqlite::load()
myStmtSelect->reset(); myStmtSelect->reset();
} }
catch (SqliteError err) { catch (SqliteError err) {
Logger::log(err.message, 1); Logger::info(err.message);
} }
return values; return values;
@ -68,7 +69,7 @@ void KeyValueRepositorySqlite::save(const std::map<string, Variant>& values)
tx.commit(); tx.commit();
} }
catch (SqliteError err) { catch (SqliteError err) {
Logger::log(err.message, 1); Logger::info(err.message);
} }
} }
@ -86,7 +87,7 @@ void KeyValueRepositorySqlite::save(const string& key, const Variant& value)
myStmtInsert->reset(); myStmtInsert->reset();
} }
catch (SqliteError err) { catch (SqliteError err) {
Logger::log(err.message, 1); Logger::info(err.message);
} }
} }

2
src/common/repository/sqlite/SettingsDb.cxx
View File

@ -38,7 +38,7 @@ bool SettingsDb::initialize()
mySettingsRepository->initialize(); mySettingsRepository->initialize();
} }
catch (SqliteError err) { catch (SqliteError err) {
Logger::log("sqlite DB " + myDb->fileName() + " failed to initialize: " + err.message, 1); Logger::info("sqlite DB " + myDb->fileName() + " failed to initialize: " + err.message);
myDb.reset(); myDb.reset();
mySettingsRepository.reset(); mySettingsRepository.reset();

8
src/common/repository/sqlite/SqliteDatabase.cxx
View File

@ -55,7 +55,7 @@ void SqliteDatabase::initialize()
dbInitialized = sqlite3_exec(myHandle, "PRAGMA schema_version", nullptr, nullptr, nullptr) == SQLITE_OK; dbInitialized = sqlite3_exec(myHandle, "PRAGMA schema_version", nullptr, nullptr, nullptr) == SQLITE_OK;
if (!dbInitialized && tries == 1) { if (!dbInitialized && tries == 1) {
Logger::log("sqlite DB " + myDatabaseFile + " seems to be corrupt, removing and retrying...", 1); Logger::info("sqlite DB " + myDatabaseFile + " seems to be corrupt, removing and retrying...");
remove(myDatabaseFile.c_str()); remove(myDatabaseFile.c_str());
if (myHandle) sqlite3_close_v2(myHandle); if (myHandle) sqlite3_close_v2(myHandle);
@ -75,7 +75,7 @@ void SqliteDatabase::initialize()
throw SqliteError("unable to initialize sqlite DB for unknown reason"); throw SqliteError("unable to initialize sqlite DB for unknown reason");
}; };
Logger::log("successfully opened " + myDatabaseFile, 2); Logger::debug("successfully opened " + myDatabaseFile);
exec("PRAGMA journal_mode=WAL"); exec("PRAGMA journal_mode=WAL");
@ -84,11 +84,11 @@ void SqliteDatabase::initialize()
break; break;
case SQLITE_MISUSE: case SQLITE_MISUSE:
Logger::log("failed to checkpoint WAL on " + myDatabaseFile + " - WAL probably unavailable", 1); Logger::info("failed to checkpoint WAL on " + myDatabaseFile + " - WAL probably unavailable");
break; break;
default: default:
Logger::log("failed to checkpoint WAL on " + myDatabaseFile + " : " + sqlite3_errmsg(myHandle), 1); Logger::info("failed to checkpoint WAL on " + myDatabaseFile + " : " + sqlite3_errmsg(myHandle));
break; break;
} }
} }

10
src/libretro/SoundLIBRETRO.cxx
View File

@ -42,8 +42,8 @@ SoundLIBRETRO::SoundLIBRETRO(OSystem& osystem, AudioSettings& audioSettings)
myUnderrun(false), myUnderrun(false),
myAudioSettings(audioSettings) myAudioSettings(audioSettings)
{ {
Logger::log("SoundLIBRETRO::SoundLIBRETRO started ...", 2); Logger::debug("SoundLIBRETRO::SoundLIBRETRO started ...");
Logger::log("SoundLIBRETRO::SoundLIBRETRO initialized", 2); Logger::debug("SoundLIBRETRO::SoundLIBRETRO initialized");
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -57,7 +57,7 @@ void SoundLIBRETRO::open(shared_ptr<AudioQueue> audioQueue,
{ {
myEmulationTiming = emulationTiming; myEmulationTiming = emulationTiming;
Logger::log("SoundLIBRETRO::open started ...", 2); Logger::debug("SoundLIBRETRO::open started ...");
audioQueue->ignoreOverflows(!myAudioSettings.enabled()); audioQueue->ignoreOverflows(!myAudioSettings.enabled());
@ -65,7 +65,7 @@ void SoundLIBRETRO::open(shared_ptr<AudioQueue> audioQueue,
myUnderrun = true; myUnderrun = true;
myCurrentFragment = nullptr; myCurrentFragment = nullptr;
Logger::log("SoundLIBRETRO::open finished", 2); Logger::debug("SoundLIBRETRO::open finished");
myIsInitializedFlag = true; myIsInitializedFlag = true;
} }
@ -79,7 +79,7 @@ void SoundLIBRETRO::close()
myAudioQueue.reset(); myAudioQueue.reset();
myCurrentFragment = nullptr; myCurrentFragment = nullptr;
Logger::log("SoundLIBRETRO::close", 2); Logger::debug("SoundLIBRETRO::close");
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -