projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index 3ad6516c11b7b56ee270c269967bd3d59177e464..2ba273b44dd09e2e254c3a914ce16d2829959cee 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-26,27
+26,26
@@
#include <string>
#include <boost/thread/mutex.hpp>
#include <string>
#include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
/** @class Log
* @brief A very simple logging class.
*/
/** @class Log
* @brief A very simple logging class.
*/
-class Log
+class Log
: public boost::noncopyable
{
public:
Log ();
virtual ~Log () {}
{
public:
Log ();
virtual ~Log () {}
- enum Level {
- STANDARD = 0,
- VERBOSE = 1,
- TIMING = 2
- };
+ static const int TYPE_GENERAL;
+ static const int TYPE_WARNING;
+ static const int TYPE_ERROR;
+ static const int TYPE_TIMING;
- void log (std::string m
, Level l = STANDARD
);
- void microsecond_log (std::string m
, Level l = STANDARD
);
+ void log (std::string m
essage, int type
);
+ void microsecond_log (std::string m
essage, int type
);
- void set_level (Level l);
- void set_level (std::string l);
+ void set_types (int types);
protected:
/** mutex to protect the log */
protected:
/** mutex to protect the log */
@@
-54,20
+53,29
@@
protected:
private:
virtual void do_log (std::string m) = 0;
private:
virtual void do_log (std::string m) = 0;
+ void config_changed ();
- /**
level above which to ignore log messages
*/
-
Level _level
;
+ /**
bit-field of log types which should be put into the log (others are ignored)
*/
+
int _types
;
};
class FileLog : public Log
{
public:
};
class FileLog : public Log
{
public:
- FileLog (
std::string
file);
+ FileLog (
boost::filesystem::path
file);
private:
void do_log (std::string m);
/** filename to write to */
private:
void do_log (std::string m);
/** filename to write to */
- std::string _file;
+ boost::filesystem::path _file;
+};
+
+class NullLog : public Log
+{
+public:
+
+private:
+ void do_log (std::string) {}
};
#endif
};
#endif