projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't throw an error when the Butler says it is finished (#2097).
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index e0ecf8d717ef1b2ce1254b3d76c88349ccd6b4ba..142e4622321ffbeb22c68c9d5407dcbcf3c9b06b 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,13
+18,16
@@
*/
*/
+
#ifndef DCPOMATIC_LOG_H
#define DCPOMATIC_LOG_H
#ifndef DCPOMATIC_LOG_H
#define DCPOMATIC_LOG_H
+
/** @file src/log.h
* @brief A very simple logging class.
*/
/** @file src/log.h
* @brief A very simple logging class.
*/
+
#include "log_entry.h"
#include <dcp/types.h>
#include <boost/thread/mutex.hpp>
#include "log_entry.h"
#include <dcp/types.h>
#include <boost/thread/mutex.hpp>
@@
-32,16
+35,20
@@
#include <boost/signals2.hpp>
#include <string>
#include <boost/signals2.hpp>
#include <string>
+
/** @class Log
* @brief A very simple logging class.
*/
/** @class Log
* @brief A very simple logging class.
*/
-class Log
: public boost::noncopyable
+class Log
{
public:
Log ();
virtual ~Log () {}
{
public:
Log ();
virtual ~Log () {}
- void log (boost::shared_ptr<const LogEntry> entry);
+ 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 dcp_log (dcp::NoteType type, std::string message);
void log (std::string message, int type);
void dcp_log (dcp::NoteType type, std::string message);
@@
-54,6
+61,7
@@
public:
* may be shorter or longer than this.
*/
virtual std::string head_and_tail (int amount = 1024) const {
* may be shorter or longer than this.
*/
virtual std::string head_and_tail (int amount = 1024) const {
+ (void) amount;
return "";
}
return "";
}
@@
-63,10
+71,11
@@
protected:
mutable boost::mutex _mutex;
private:
mutable boost::mutex _mutex;
private:
- virtual void do_log (
boost
::shared_ptr<const LogEntry> entry) = 0;
+ 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) */
/** bit-field of log types which should be put into the log (others are ignored) */
- int _types;
+ int _types
= 0
;
};
};
+
#endif
#endif