diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-10-28 05:36:00 -0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-13 01:59:52 -0200 |
| commit | 616d87444313db865c60fbeee36ebe5250ef301e (patch) | |
| tree | fb99bf8bebfdf8c825c5d3e4f01fb4779ceaba68 /src/citra/citra.cpp | |
| parent | 04b1f2936c606313ee28b505ec7cdcb81875cd8d (diff) | |
New logging system
Diffstat (limited to 'src/citra/citra.cpp')
| -rw-r--r-- | src/citra/citra.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index f2aeb510e5..7c031ce8db 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -2,8 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <thread> + #include "common/common.h" -#include "common/log_manager.h" +#include "common/logging/text_formatter.h" +#include "common/logging/backend.h" +#include "common/scope_exit.h" #include "core/settings.h" #include "core/system.h" @@ -15,7 +19,12 @@ /// Application entry point int __cdecl main(int argc, char **argv) { - LogManager::Init(); + std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); + std::thread logging_thread(Log::TextLoggingLoop, logger); + SCOPE_EXIT({ + logger->Close(); + logging_thread.join(); + }); if (argc < 2) { ERROR_LOG(BOOT, "Failed to load ROM: No ROM specified"); @@ -24,9 +33,6 @@ int __cdecl main(int argc, char **argv) { Config config; - if (!Settings::values.enable_log) - LogManager::Shutdown(); - std::string boot_filename = argv[1]; EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; |