C++11 tidying.

[dcpomatic.git] / src / lib / log.cc

diff --git a/src/lib/log.cc b/src/lib/log.cc
index a2f420ce1b0b8211f0cd3d6e23d759a00c477afc..97b6498938cc1f0992c76829b3e4f1110b4a9f14 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,151 +1,100 @@
 /*
-    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/>.
 
 */
 
+
 /** @file src/log.cc
  *  @brief A very simple logging class.
  */
 
-#include <time.h>
-#include <cstdio>
-#include <boost/algorithm/string.hpp>
+
 #include "log.h"
 #include "cross.h"
 #include "config.h"
+#include "string_log_entry.h"
+#include <time.h>
+#include <cstdio>
 
 #include "i18n.h"
 
-using namespace std;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
 
-int const Log::TYPE_GENERAL = 0x1;
-int const Log::TYPE_WARNING = 0x2;
-int const Log::TYPE_ERROR   = 0x4;
-int const Log::TYPE_TIMING  = 0x8;
+using std::string;
+using std::cout;
+using std::shared_ptr;
+using std::make_shared;
+
 
 Log::Log ()
-       : _types (0)
 {
-       Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
-       config_changed ();
-}
 
-void
-Log::config_changed ()
-{
-       set_types (Config::instance()->log_types ());
 }
 
-/** @param n String to log */
+
 void
-Log::log (string message, int type)
+Log::log (shared_ptr<const LogEntry> e)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if ((_types & type) == 0) {
+       if ((_types & e->type()) == 0) {
                return;
        }
 
-       time_t t;
-       time (&t);
-       string a = ctime (&t);
-
-       stringstream s;
-       s << a.substr (0, a.length() - 1) << N_(": ");
-
-       if (type & TYPE_ERROR) {
-               s << "ERROR: ";
-       }
-
-       if (type & TYPE_WARNING) {
-               s << "WARNING: ";
-       }
-       
-       s << message;
-       do_log (s.str ());
+       do_log (e);
 }
 
+
+/** @param n String to log */
 void
-Log::microsecond_log (string m, int t)
+Log::log (string message, int type)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if ((_types & t) == 0) {
+       if ((_types & type) == 0) {
                return;
        }
 
-       struct timeval tv;
-       gettimeofday (&tv, 0);
-
-       stringstream s;
-       s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
-       do_log (s.str ());
-}      
+       auto e = make_shared<StringLogEntry>(type, message);
 
-void
-Log::set_types (int t)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       _types = t;
+       do_log (e);
 }
 
-/** @param A comma-separate list of debug types to enable */
+
 void
-Log::set_types (string t)
+Log::dcp_log (dcp::NoteType type, string m)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-
-       vector<string> types;
-       split (types, t, is_any_of (","));
-
-       _types = 0;
-
-       for (vector<string>::const_iterator i = types.begin(); i != types.end(); ++i) {
-               if (*i == N_("general")) {
-                       _types |= TYPE_GENERAL;
-               } else if (*i == N_("warning")) {
-                       _types |= TYPE_WARNING;
-               } else if (*i == N_("error")) {
-                       _types |= TYPE_ERROR;
-               } else if (*i == N_("timing")) {
-                       _types |= TYPE_TIMING;
-               }
+       switch (type) {
+       case dcp::NoteType::PROGRESS:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_GENERAL, m));
+               break;
+       case dcp::NoteType::ERROR:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_ERROR, m));
+               break;
+       case dcp::NoteType::NOTE:
+               do_log (make_shared<StringLogEntry>(LogEntry::TYPE_WARNING, m));
+               break;
        }
 }
 
-/** @param file Filename to write log to */
-FileLog::FileLog (boost::filesystem::path file)
-       : _file (file)
-{
-
-}
 
 void
-FileLog::do_log (string m)
+Log::set_types (int t)
 {
-       FILE* f = fopen_boost (_file, "a");
-       if (!f) {
-               cout << "(could not log to " << _file.string() << "): " << m << "\n";
-               return;
-       }
-
-       fprintf (f, "%s\n", m.c_str ());
-       fclose (f);
+       boost::mutex::scoped_lock lm (_mutex);
+       _types = t;
 }
-