X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.h;h=c71f8ab16cff700b6cce7265a91de27ff7ab9afd;hp=94d30de4ecbb109a8b557bc145041c2517685899;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=10b4bf78da1dcdb96915506bd61a0ab1b2ea65ed

diff --git a/src/lib/log.h b/src/lib/log.h
index 94d30de4e..c71f8ab16 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012 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/>.
 
 */
 
@@ -24,10 +25,12 @@
  *  @brief A very simple logging class.
  */
 
-#include <string>
+#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.
@@ -38,44 +41,33 @@ public:
 	Log ();
 	virtual ~Log () {}
 
-	static const int TYPE_GENERAL;
-	static const int TYPE_WARNING;
-	static const int TYPE_ERROR;
-	static const int TYPE_TIMING;
-
+	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;
+	}
 
-private:
-	virtual void do_log (std::string m) = 0;
-	void config_changed ();
-	
-	/** mutex to protect the log */
-	boost::mutex _mutex;
-	/** bit-field of log types which should be put into the log (others are ignored) */
-	int _types;
-	boost::signals2::scoped_connection _config_connection;
-};
+	/** @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 {
+		(void) amount;
+		return "";
+	}
 
-class FileLog : public Log
-{
-public:
-	FileLog (boost::filesystem::path file);
+protected:
 
-private:
-	void do_log (std::string m);
-	/** filename to write to */
-	boost::filesystem::path _file;
-};
+	/** mutex to protect the log */
+	mutable boost::mutex _mutex;
 
-class NullLog : public Log
-{
-public:
+private:
+	virtual void do_log (std::shared_ptr<const LogEntry> entry) = 0;
 
-private:	
-	void do_log (std::string) {}
+	/** bit-field of log types which should be put into the log (others are ignored) */
+	int _types;
 };
 
 #endif