X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=142e4622321ffbeb22c68c9d5407dcbcf3c9b06b;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=b102a2d653983c3368bf04d8669f5f440e05df19;hpb=b1aae1f32e72cd96768d6134ef62fd4b45a9bd54;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index b102a2d65..142e46223 100644
--- 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,25 +35,35 @@
 #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);
 
 	void set_types (int types);
+	int types () const {
+		return _types;
+	}
 
 	/** @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:
 
@@ -58,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