Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 2e5d69a0828a77d508b3cc1d4c122898204eb027..3a2cfcbfd53e7882a61feaa03268738036a60b1f 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -34,6 +34,7 @@ class Log
 {
 public:
        Log ();
+       virtual ~Log () {}
 
        enum Level {
                STANDARD = 0,
@@ -45,6 +46,7 @@ public:
        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 */