Use dcp::file_to_string().

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 416f4259d248399ed88cbff3f7d682ba2e3c0bf9..142e4622321ffbeb22c68c9d5407dcbcf3c9b06b 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,16 @@
 
 */
 
+
 #ifndef DCPOMATIC_LOG_H
 #define DCPOMATIC_LOG_H
 
+
 /** @file src/log.h
  *  @brief A very simple logging class.
  */
 
+
 #include "log_entry.h"
 #include <dcp/types.h>
 #include <boost/thread/mutex.hpp>
@@ -32,16 +35,20 @@
 #include <boost/signals2.hpp>
 #include <string>
 
+
 /** @class Log
  *  @brief A very simple logging class.
  */
-class Log : public boost::noncopyable
+class Log
 {
 public:
        Log ();
        virtual ~Log () {}
 
-       void log (boost::shared_ptr<const LogEntry> entry);
+       Log (Log const&) = delete;
+       Log& operator= (Log const&) = delete;
+
+       void log (std::shared_ptr<const LogEntry> entry);
        void log (std::string message, int type);
        void dcp_log (dcp::NoteType type, std::string message);
 
@@ -53,7 +60,10 @@ public:
        /** @param amount Approximate number of bytes to return; the returned value
         *  may be shorter or longer than this.
         */
-       virtual std::string head_and_tail (int amount = 1024) const = 0;
+       virtual std::string head_and_tail (int amount = 1024) const {
+               (void) amount;
+               return "";
+       }
 
 protected:
 
@@ -61,10 +71,11 @@ protected:
        mutable boost::mutex _mutex;
 
 private:
-       virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
+       virtual void do_log (std::shared_ptr<const LogEntry> entry) = 0;
 
        /** bit-field of log types which should be put into the log (others are ignored) */
-       int _types;
+       int _types = 0;
 };
 
+
 #endif