projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index f14adc26fd054034893c589941498b887700df42..1b7cef03891c107d979bb465ed05ef6e8700b24f 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-24,6
+24,7
@@
* @brief A very simple logging class.
*/
* @brief A very simple logging class.
*/
+#include <dcp/types.h>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
@@
-46,20
+47,21
@@
public:
void log (std::string message, int type);
void microsecond_log (std::string message, int type);
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);
virtual std::string head_and_tail (int amount = 1024) const = 0;
protected:
void set_types (int types);
virtual std::string head_and_tail (int amount = 1024) const = 0;
protected:
-
+
/** mutex to protect the log */
mutable boost::mutex _mutex;
/** mutex to protect the log */
mutable boost::mutex _mutex;
-
+
private:
virtual void do_log (std::string m) = 0;
void config_changed ();
private:
virtual void do_log (std::string m) = 0;
void config_changed ();
-
+
/** bit-field of log types which should be put into the log (others are ignored) */
int _types;
boost::signals2::scoped_connection _config_connection;
/** bit-field of log types which should be put into the log (others are ignored) */
int _types;
boost::signals2::scoped_connection _config_connection;
@@
-85,7
+87,7
@@
public:
return "";
}
return "";
}
-private:
+private:
void do_log (std::string) {}
};
void do_log (std::string) {}
};