X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=991532404293a7a01fc59762b3b1b8b0d15af6ec;hb=7e2cf1a4a04828b5a57d5eb6869475a819005602;hp=2a242e24c96e8f49bfb171d81bac463085ad9f02;hpb=c0ed407fb02891f0dd364e78b6192f0e6dbe1d8d;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index 2a242e24c..991532404 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_LOG_H
-#define DVDOMATIC_LOG_H
+#ifndef DCPOMATIC_LOG_H
+#define DCPOMATIC_LOG_H
 
 /** @file src/log.h
  *  @brief A very simple logging class.
@@ -26,23 +26,28 @@
 
 #include <string>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 /** @class Log
  *  @brief A very simple logging class.
  */
-class Log
+class Log : public boost::noncopyable
 {
 public:
 	Log ();
+	virtual ~Log () {}
 
 	enum Level {
 		STANDARD = 0,
-		VERBOSE = 1
+		VERBOSE = 1,
+		TIMING = 2
 	};
 
 	void log (std::string m, Level l = STANDARD);
+	void microsecond_log (std::string m, Level l = STANDARD);
 
 	void set_level (Level l);
+	void set_level (std::string l);
 
 protected:	
 	/** mutex to protect the log */
@@ -58,12 +63,20 @@ private:
 class FileLog : public Log
 {
 public:
-	FileLog (std::string file);
+	FileLog (boost::filesystem::path file);
 
 private:
 	void do_log (std::string m);
 	/** filename to write to */
-	std::string _file;
+	boost::filesystem::path _file;
+};
+
+class NullLog : public Log
+{
+public:
+
+private:	
+	void do_log (std::string) {}
 };
 
 #endif