X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=142e4622321ffbeb22c68c9d5407dcbcf3c9b06b;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=2acef6601e4d2ea9c5daababe415e519747c6f81;hpb=3c86edba7f02de3a65c7a58937f11429050b3e10;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index 2acef6601..142e46223 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -1,61 +1,69 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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>
 #include <boost/filesystem.hpp>
 #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 () {}
 
-	static const int TYPE_GENERAL;
-	static const int TYPE_WARNING;
-	static const int TYPE_ERROR;
-	static const int TYPE_DEBUG_DECODE;
-	static const int TYPE_DEBUG_ENCODE;
-	static const int TYPE_TIMING;
+	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 microsecond_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:
 
@@ -63,12 +71,11 @@ protected:
 	mutable boost::mutex _mutex;
 
 private:
-	virtual void do_log (std::string m) = 0;
-	void config_changed ();
+	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;
-	boost::signals2::scoped_connection _config_connection;
+	int _types = 0;
 };
 
+
 #endif