Separate internal logging.h and API logger.h

Also add a "None" logging level

Thus remove NoopLogger, and sort logging levels by verbosity.

Author: xlz

examples/protonect/include/libfreenect2/logger.h

@@ -0,0 +1,68 @@
+/*
+ * This file is part of the OpenKinect Project. http://www.openkinect.org
+ *
+ * Copyright (c) 2014 individual OpenKinect contributors. See the CONTRIB file
+ * for details.
+ *
+ * This code is licensed to you under the terms of the Apache License, version
+ * 2.0, or, at your option, the terms of the GNU General Public License,
+ * version 2.0. See the APACHE20 and GPL2 files for the text of the licenses,
+ * or the following URLs:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * If you redistribute this file in source form, modified or unmodified, you
+ * may:
+ *   1) Leave this header intact and distribute it under the same terms,
+ *      accompanying it with the APACHE20 and GPL20 files, or
+ *   2) Delete the Apache 2.0 clause and accompany it with the GPL2 file, or
+ *   3) Delete the GPL v2 clause and accompany it with the APACHE20 file
+ * In all cases you must keep the copyright notice intact and include a copy
+ * of the CONTRIB file.
+ *
+ * Binary distributions must follow the binary distribution requirements of
+ * either License.
+ */
+
+#ifndef LIBFREENECT2_LOGGER_H_
+#define LIBFREENECT2_LOGGER_H_
+
+#include <string>
+#include <sstream>
+
+#include <libfreenect2/config.h>
+
+namespace libfreenect2
+{
+
+class LIBFREENECT2_API Logger
+{
+public:
+  enum Level
+  {
+    None = 0,
+    Error = 1,
+    Warning = 2,
+    Info = 3,
+    Debug = 4,
+  };
+  static Level getDefaultLevel();
+
+  virtual ~Logger();
+
+  virtual Level level() const;
+
+  virtual void log(Level level, const std::string &message) = 0;
+protected:
+  Level level_;
+};
+
+LIBFREENECT2_API Logger *createConsoleLogger(Logger::Level level);
+LIBFREENECT2_API Logger *createConsoleLoggerWithDefaultLevel();
+
+//libfreenect2 frees the memory of the logger passed in.
+LIBFREENECT2_API Logger *getGlobalLogger();
+LIBFREENECT2_API void setGlobalLogger(Logger *logger);
+
+} /* namespace libfreenect2 */
+#endif /* LIBFREENECT2_LOGGER_H_ */

examples/protonect/include/libfreenect2/logging.h

@@ -31,40 +31,12 @@
 #include <sstream>
 
 #include <libfreenect2/config.h>
+#include <libfreenect2/logger.h>
 
 namespace libfreenect2
 {
 
-class LIBFREENECT2_API Logger
-{
-public:
-  enum Level
-  {
-    Debug = 1,
-    Info = 2,
-    Warning = 3,
-    Error = 4,
-  };
-  static Level getDefaultLevel();
-
-  virtual ~Logger();
-
-  virtual Level level() const;
-
-  virtual void log(Level level, const std::string &message) = 0;
-protected:
-  Level level_;
-};
-
-LIBFREENECT2_API Logger *createConsoleLogger(Logger::Level level);
-LIBFREENECT2_API Logger *createConsoleLoggerWithDefaultLevel();
-LIBFREENECT2_API Logger *createNoopLogger();
-
-//libfreenect2 frees the memory of the logger passed in.
-LIBFREENECT2_API Logger *getGlobalLogger();
-LIBFREENECT2_API void setGlobalLogger(Logger *logger);
-
-class LIBFREENECT2_API LogMessage
+class LogMessage
 {
 private:
   Logger *logger_;
@@ -82,14 +54,14 @@ std::string getShortName(const char *func);
 } /* namespace libfreenect2 */
 
 #if defined(__GNUC__) or defined(__clang__)
-#define LIBFREENECT2_LOG_SOURCE ::libfreenect2::getShortName(__PRETTY_FUNCTION__)
+#define LOG_SOURCE ::libfreenect2::getShortName(__PRETTY_FUNCTION__)
 #elif defined(_MSC_VER)
-#define LIBFREENECT2_LOG_SOURCE ::libfreenect2::getShortName(__FUNCSIG__)
+#define LOG_SOURCE ::libfreenect2::getShortName(__FUNCSIG__)
 #else
-#define LIBFREENECT2_LOG_SOURCE ""
+#define LOG_SOURCE ""
 #endif
 
-#define LOG(LEVEL) (::libfreenect2::LogMessage(::libfreenect2::getGlobalLogger(), ::libfreenect2::Logger::LEVEL).stream() << "[" << LIBFREENECT2_LOG_SOURCE << "] ")
+#define LOG(LEVEL) (::libfreenect2::LogMessage(::libfreenect2::getGlobalLogger(), ::libfreenect2::Logger::LEVEL).stream() << "[" << LOG_SOURCE << "] ")
 #define LOG_DEBUG LOG(Debug)
 #define LOG_INFO LOG(Info)
 #define LOG_WARNING LOG(Warning)

examples/protonect/src/logging.cpp

@@ -54,6 +54,8 @@ Logger::Level Logger::getDefaultLevel()
       l = Logger::Warning;
     else if(env_logger_level_str == "error")
       l = Logger::Error;
+    else if(env_logger_level_str == "none")
+      l = Logger::None;
   }
 
   return l;
@@ -91,23 +93,12 @@ class ConsoleLogger : public Logger
   virtual ~ConsoleLogger() {}
   virtual void log(Level level, const std::string &message)
   {
-    if(level < level_) return;
+    if(level > level_) return;
 
     (level >= Warning ? std::cerr : std::cout) << "[" << level2str(level) << "] " << message << std::endl;
   }
 };
 
-class NoopLogger : public Logger
-{
-public:
-  NoopLogger()
-  {
-    level_ = Debug;
-  }
-  virtual ~NoopLogger() {}
-  virtual void log(Level level, const std::string &message) {}
-};
-
 Logger *createConsoleLogger(Logger::Level level)
 {
   return new ConsoleLogger(level);
@@ -118,11 +109,6 @@ Logger *createConsoleLoggerWithDefaultLevel()
   return new ConsoleLogger(Logger::getDefaultLevel());
 }
 
-Logger *createNoopLogger()
-{
-  return new NoopLogger();
-}
-
 LogMessage::LogMessage(Logger *logger, Logger::Level level) : logger_(logger), level_(level)
 {