diff options
| author | 2014-11-13 17:32:03 +0100 | |
|---|---|---|
| committer | 2014-11-18 13:03:02 +0100 | |
| commit | c8d933a14211ce6ee02659ecef758a1f303bc87f (patch) | |
| tree | 3f7a6a5bd652602b5e5ea6442c14d2b855c4dd4b | |
| parent | Merge pull request #200 from lioncash/statics (diff) | |
| download | yuzu-c8d933a14211ce6ee02659ecef758a1f303bc87f.tar.gz yuzu-c8d933a14211ce6ee02659ecef758a1f303bc87f.tar.xz yuzu-c8d933a14211ce6ee02659ecef758a1f303bc87f.zip | |
Add a GUI logging channel.
Replace asserts with _dbg_assert_.
| -rw-r--r-- | src/common/log.h | 1 | ||||
| -rw-r--r-- | src/common/log_manager.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/log.h b/src/common/log.h index bfd73f8a5..822cd21eb 100644 --- a/src/common/log.h +++ b/src/common/log.h | |||
| @@ -69,6 +69,7 @@ enum LOG_TYPE { | |||
| 69 | HW, | 69 | HW, |
| 70 | TIME, | 70 | TIME, |
| 71 | NETPLAY, | 71 | NETPLAY, |
| 72 | GUI, | ||
| 72 | 73 | ||
| 73 | NUMBER_OF_LOGS // Must be last | 74 | NUMBER_OF_LOGS // Must be last |
| 74 | }; | 75 | }; |
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 4d590d98f..687f4e337 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp | |||
| @@ -75,6 +75,7 @@ LogManager::LogManager() | |||
| 75 | m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); | 75 | m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); |
| 76 | m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); | 76 | m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); |
| 77 | m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); | 77 | m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); |
| 78 | m_Log[LogTypes::GUI] = new LogContainer("GUI", "GUI"); | ||
| 78 | 79 | ||
| 79 | m_fileLog = new FileLogListener(FileUtil::GetUserPath(F_MAINLOG_IDX).c_str()); | 80 | m_fileLog = new FileLogListener(FileUtil::GetUserPath(F_MAINLOG_IDX).c_str()); |
| 80 | m_consoleLog = new ConsoleListener(); | 81 | m_consoleLog = new ConsoleListener(); |