projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash due to lack of signal disconnection.
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index c11daf61708f23d9b0578cad8062e8dd2d652b74..94d30de4ecbb109a8b557bc145041c2517685899 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-27,6
+27,7
@@
#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
/** @class Log
* @brief A very simple logging class.
/** @class Log
* @brief A very simple logging class.
@@
-46,18
+47,16
@@
public:
void microsecond_log (std::string message, int type);
void set_types (int types);
void microsecond_log (std::string message, int type);
void set_types (int types);
- void set_types (std::string types);
-protected:
- /** mutex to protect the log */
- 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 ();
+ /** mutex to protect the log */
+ boost::mutex _mutex;
/** bit-field of log types which should be put into the log (others are ignored) */
int _types;
/** 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
};
class FileLog : public Log