projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update xml_subtitle_test result now that subtitles are being compared; improve placem...
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index 2e5d69a0828a77d508b3cc1d4c122898204eb027..300df743b9c7f4f790eafc4e465b45a7a1dfffe7 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-17,55
+17,75
@@
*/
*/
-#ifndef D
VD
OMATIC_LOG_H
-#define D
VD
OMATIC_LOG_H
+#ifndef D
CP
OMATIC_LOG_H
+#define D
CP
OMATIC_LOG_H
/** @file src/log.h
* @brief A very simple logging class.
*/
/** @file src/log.h
* @brief A very simple logging class.
*/
-#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
+#include <string>
/** @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 ();
{
public:
Log ();
+ virtual ~Log () {}
+
+ static const int TYPE_GENERAL;
+ static const int TYPE_WARNING;
+ static const int TYPE_ERROR;
+ static const int TYPE_TIMING;
- enum Level {
- STANDARD = 0,
- VERBOSE = 1,
- TIMING = 2
- };
+ void log (std::string message, int type);
+ void microsecond_log (std::string message, int type);
- void log (std::string m, Level l = STANDARD);
- void microsecond_log (std::string m, Level l = STANDARD);
+ void set_types (int types);
- v
oid set_level (Level l)
;
+ v
irtual std::string head_and_tail (int amount = 1024) const = 0
;
-protected:
+protected:
+
/** mutex to protect the log */
/** mutex to protect the log */
- boost::mutex _mutex;
+
mutable
boost::mutex _mutex;
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;
+ boost::signals2::scoped_connection _config_connection;
};
class FileLog : public Log
{
public:
};
class FileLog : public Log
{
public:
- FileLog (std::string file);
+ FileLog (boost::filesystem::path file);
+
+ std::string head_and_tail (int amount = 1024) const;
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:
+ std::string head_and_tail (int) const {
+ return "";
+ }
+
+private:
+ void do_log (std::string) {}
};
#endif
};
#endif