Merge master; fix crash on new film.

[dcpomatic.git] / src / lib / log.h

diff --git a/src/lib/log.h b/src/lib/log.h
index 2a242e24c96e8f49bfb171d81bac463085ad9f02..3ad6516c11b7b56ee270c269967bd3d59177e464 100644 (file)
--- 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.
@@ -34,15 +34,19 @@ class Log
 {
 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 */