Merge master into direct-mxf.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 650384bc7726986ff97800613f0ef09f2a41346f..7459700eacd43b783da9b61673866f8535c929b4 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -28,7 +28,7 @@
 using namespace std;
 
 Log::Log ()
-       : _level (VERBOSE)
+       : _level (STANDARD)
 {
 
 }
@@ -76,6 +76,19 @@ Log::set_level (Level l)
        _level = l;
 }
 
+void
+Log::set_level (string l)
+{
+       if (l == "verbose") {
+               set_level (VERBOSE);
+               return;
+       } else if (l == "timing") {
+               set_level (TIMING);
+               return;
+       }
+
+       set_level (STANDARD);
+}
 
 /** @param file Filename to write log to */
 FileLog::FileLog (string file)