Merge master.

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

diff --git a/src/lib/log.h b/src/lib/log.h
index c5241ebcf9607d38055cbd5cfe9b96be01bf7c70..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.
@@ -37,16 +37,16 @@ public:
        virtual ~Log () {}
 
        enum Level {
-               SILENT = 0,
+               STANDARD = 0,
                VERBOSE = 1,
-               DEBUG = 2,
-               TIMING = 3
+               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 */