X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=e1716f1c65e5671abd9c7042b861faf084fa06a8;hp=d4f469602065bc3f3776f26a87a1538c440b01aa;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=f0da433894308ed72b0dbdd116a30a8d659c33cc diff --git a/src/lib/log.cc b/src/lib/log.cc index d4f469602..e1716f1c6 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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 . */ @@ -24,7 +25,6 @@ #include "log.h" #include "cross.h" #include "config.h" -#include "safe_stringstream.h" #include "string_log_entry.h" #include #include @@ -33,19 +33,12 @@ using std::string; using std::cout; -using boost::shared_ptr; +using std::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 @@ -72,10 +65,6 @@ Log::log (string message, int type) shared_ptr e (new StringLogEntry (type, message)); -#ifdef DCPOMATIC_DEBUG - cout << e->get() << "\n"; -#endif - do_log (e); }