More log cleanup. Commented the old macros in Log.h, uncomment it if there are any problems.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2520 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 28 insertions, 16 deletions

diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
index fd15103a1b..474a8e4ae2 100644
--- a/Source/Core/Common/Src/Log.h
+++ b/Source/Core/Common/Src/Log.h
@@ -69,32 +69,44 @@ enum LOG_LEVELS {
 }  // namespace

 

 

+/* 

+   FIXME: 

+   - How can generic_log support log levels in compile time?

+   Maybe it should call ERROR/.. according to level instead of the other way around.

+   - Check if we can make the win32 and gcc togther (get rid of those ##)

+   - Compile the log functions according to LOGLEVEL 

+*/

 #ifdef LOGGING

+#define LOGLEVEL 4

 

 extern void __Log(int logNumber, const char* text, ...);

-extern void __Logv(int log, int v, const char *format, ...);

+//extern void __Logv(int log, int v, const char *format, ...);

 

 #ifdef _WIN32

 

-#define LOG(t, ...)       __Log(LogTypes::t, __VA_ARGS__);

-#define LOGV(t, v, ...)   __Log(LogTypes::t + (v)*100, __VA_ARGS__);

-#define LOGP(t, ...)      __Log(t, __VA_ARGS__);

-#define LOGVP(t, v, ...)  __Log(t + (v)*100, __VA_ARGS__);

-#define ERROR_LOG(t, ...) {LOGV(t, LogTypes::LERROR, __VA_ARGS__)}

-#define WARN_LOG(t, ...)  {LOGV(t, LogTypes::LINFO, __VA_ARGS__)}

-#define INFO_LOG(t, ...)  {LOGV(t, LogTypes::LWARNING, __VA_ARGS__)}

-#define DEBUG_LOG(t ,...) {LOGV(t, LogTypes::LDEBUG, __VA_ARGS__)}

+/* #define LOG(t, ...)       __Log(LogTypes::t, __VA_ARGS__); */

+/* #define LOGV(t, v, ...)   __Log(LogTypes::t + (v)*100, __VA_ARGS__); */

+/* #define LOGP(t, ...)      __Log(t, __VA_ARGS__); */

+/* #define LOGVP(t, v, ...)  __Log(t + (v)*100, __VA_ARGS__); */

+

+

+#define GENERIC_LOG(t,v, ...) {__Log(t + (v)*100, __VA_ARGS__);}

+#define ERROR_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__)}

+#define WARN_LOG(t,...)  {GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__)}

+#define INFO_LOG(t,...)  {GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__)}

+#define DEBUG_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__)}

 

 #else

 

 //#define LOG(t, ...)      __Log(LogTypes::t, ##__VA_ARGS__);

-#define LOGV(t,v, ...)   __Log(LogTypes::t + (v)*100, ##__VA_ARGS__);

-#define LOGP(t, ...)     __Log(t, ##__VA_ARGS__);

-#define LOGVP(t,v, ...)  __Log(t + (v)*100, ##__VA_ARGS__);

-#define ERROR_LOG(t,...) {LOGV(t, LogTypes::LERROR, ##__VA_ARGS__)}

-#define WARN_LOG(t,...)  {LOGV(t, LogTypes::LINFO, ##__VA_ARGS__)}

-#define INFO_LOG(t,...)  {LOGV(t, LogTypes::LWARNING, ##__VA_ARGS__)}

-#define DEBUG_LOG(t,...) {LOGV(t, LogTypes::LDEBUG, ##__VA_ARGS__)}

+//#define LOGV(t,v, ...)   __Log(LogTypes::t + (v)*100, ##__VA_ARGS__);

+//#define LOGP(t, ...)     __Log(t, ##__VA_ARGS__);

+//#define LOGVP(t,v, ...)  __Log(t + (v)*100, ##__VA_ARGS__);

+#define GENERIC_LOG(t,v, ...) {__Log(t + (v)*100, ##__VA_ARGS__);}

+#define ERROR_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LERROR, ##__VA_ARGS__)}

+#define WARN_LOG(t,...)  {GENERIC_LOG(LogTypes::t, LogTypes::LINFO, ##__VA_ARGS__)}

+#define INFO_LOG(t,...)  {GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, ##__VA_ARGS__)}

+#define DEBUG_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, ##__VA_ARGS__)}

 

 #endif // WIN32