summaryrefslogtreecommitdiff
path: root/src/common/log_manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/log_manager.cpp')
-rw-r--r--src/common/log_manager.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 4d590d98f..38c681ee0 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -9,7 +9,7 @@
9#include "common/timer.h" 9#include "common/timer.h"
10#include "common/thread.h" 10#include "common/thread.h"
11 11
12void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, 12void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
13 const char* function, const char* fmt, ...) 13 const char* function, const char* fmt, ...)
14{ 14{
15 va_list args; 15 va_list args;
@@ -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();
@@ -111,7 +112,7 @@ LogManager::~LogManager()
111 delete m_debuggerLog; 112 delete m_debuggerLog;
112} 113}
113 114
114void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, 115void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file,
115 int line, const char* function, const char *fmt, va_list args) 116 int line, const char* function, const char *fmt, va_list args)
116{ 117{
117 char temp[MAX_MSGLEN]; 118 char temp[MAX_MSGLEN];
@@ -124,11 +125,11 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const
124 Common::CharArrayFromFormatV(temp, MAX_MSGLEN, fmt, args); 125 Common::CharArrayFromFormatV(temp, MAX_MSGLEN, fmt, args);
125 126
126 static const char level_to_char[7] = "ONEWID"; 127 static const char level_to_char[7] = "ONEWID";
127 sprintf(msg, "%s %s:%u %c[%s] %s: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line, 128 sprintf(msg, "%s %s:%u %c[%s] %s: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line,
128 level_to_char[(int)level], log->GetShortName(), function, temp); 129 level_to_char[(int)level], log->GetShortName(), function, temp);
129 130
130#ifdef ANDROID 131#ifdef ANDROID
131 Host_SysMessage(msg); 132 Host_SysMessage(msg);
132#endif 133#endif
133 log->Trigger(level, msg); 134 log->Trigger(level, msg);
134} 135}