X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=7851c133f9bc74f84a8cc912eecca63acd484b03;hb=f62398d081db17afd1816bfc8312afb386f22e78;hp=0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7;hpb=aeb835a18c8df347e0ed68fb24631b320abeb611;p=dcpomatic.git

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 0f7a59ff8..7851c133f 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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,7 +25,6 @@
 #include "log.h"
 #include "cross.h"
 #include "config.h"
-#include "safe_stringstream.h"
 #include "string_log_entry.h"
 #include <time.h>
 #include <cstdio>
@@ -32,19 +32,13 @@
 #include "i18n.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 
 Log::Log ()
 	: _types (0)
 {
-	_config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
-	config_changed ();
-}
 
-void
-Log::config_changed ()
-{
-	set_types (Config::instance()->log_types ());
 }
 
 void
@@ -69,7 +63,9 @@ Log::log (string message, int type)
 		return;
 	}
 
-	do_log (shared_ptr<const LogEntry> (new StringLogEntry (type, message)));
+	shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
+
+	do_log (e);
 }
 
 void