improved new vorbisfile compatibility

[chaz/yoink] / src / Moof / Log.cc

diff --git a/src/Moof/Log.cc b/src/Moof/Log.cc
index dcdb5ecf5c205e3aea8f4ab32f6309cf4e04a64e..0639a601dba5f2edb4e64212eba3862425e8873e 100644 (file)
--- a/src/Moof/Log.cc
+++ b/src/Moof/Log.cc
@@ -36,24 +36,24 @@
 namespace Mf {
 
 
-static LogLevel logLevel_ = WARNING;
+static LogLevel logLevel_ = LOG_WARNING;
 
-static void printLog_(int logLevel, const char* fmt, va_list args)
+inline void printLog_(int logLevel, const char* fmt, va_list args)
 {
        if (logLevel_ < logLevel) return;
 
        switch (logLevel)
        {
-               case ERROR:
+               case LOG_ERROR:
                        fprintf(stderr, "  error: ");
                        break;
-               case WARNING:
+               case LOG_WARNING:
                        fprintf(stderr, "warning: ");
                        break;
-               case INFO:
+               case LOG_INFO:
                        fprintf(stderr, "   info: ");
                        break;
-               case DEBUGGING:
+               case LOG_DEBUG:
                        fprintf(stderr, "  debug: ");
                        break;
        }
@@ -72,46 +72,42 @@ LogLevel setLogLevel(LogLevel level)
 }
 
 
-void
-logError(const char* fmt, ...)
+void logError(const char* fmt, ...)
 {
        va_list args;
        va_start(args, fmt);
 
-       printLog_(ERROR, fmt, args);
+       printLog_(LOG_ERROR, fmt, args);
 
        va_end(args);
 }
 
-void
-logWarning(const char* fmt, ...)
+void logWarning(const char* fmt, ...)
 {
        va_list args;
        va_start(args, fmt);
 
-       printLog_(WARNING, fmt, args);
+       printLog_(LOG_WARNING, fmt, args);
 
        va_end(args);
 }
 
-void
-logInfo(const char* fmt, ...)
+void logInfo(const char* fmt, ...)
 {
        va_list args;
        va_start(args, fmt);
 
-       printLog_(INFO, fmt, args);
+       printLog_(LOG_INFO, fmt, args);
 
        va_end(args);
 }
 
-void
-logDebug(const char* fmt, ...)
+void logDebug(const char* fmt, ...)
 {
        va_list args;
        va_start(args, fmt);
 
-       printLog_(DEBUGGING, fmt, args);
+       printLog_(LOG_DEBUG, fmt, args);
 
        va_end(args);
 }