projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Screen pointer from KDMWithMetadata, preferring to
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index 65d0229e981876a2e1741f580ce51460d4aa214d..873d5f7a1674238b7946a3a0bef1434da54d3841 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-46,11
+46,17
@@
public:
void dcp_log (dcp::NoteType type, std::string message);
void set_types (int types);
void dcp_log (dcp::NoteType type, std::string message);
void set_types (int types);
+ int types () const {
+ return _types;
+ }
/** @param amount Approximate number of bytes to return; the returned value
* may be shorter or longer than this.
*/
/** @param amount Approximate number of bytes to return; the returned value
* may be shorter or longer than this.
*/
- virtual std::string head_and_tail (int amount = 1024) const = 0;
+ virtual std::string head_and_tail (int amount = 1024) const {
+ (void) amount;
+ return "";
+ }
protected:
protected:
@@
-59,11
+65,9
@@
protected:
private:
virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
private:
virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
- void config_changed ();
/** 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;
};
#endif
};
#endif