projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Just having no specified lines value does not mean we definitely need place the subti...
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index c5241ebcf9607d38055cbd5cfe9b96be01bf7c70..b102a2d653983c3368bf04d8669f5f440e05df19 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-1,73
+1,67
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#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 "log_entry.h"
+#include <dcp/types.h>
#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 ();
virtual ~Log () {}
{
public:
Log ();
virtual ~Log () {}
- enum Level {
- SILENT = 0,
- VERBOSE = 1,
- DEBUG = 2,
- TIMING = 3
- };
+ void log (boost::shared_ptr<const LogEntry> entry);
+ void log (std::string message, int type);
+ void dcp_log (dcp::NoteType type, std::string message);
- void log (std::string m, Level l = STANDARD);
- void microsecond_log (std::string m, Level l = STANDARD);
+ void set_types (int types);
- void set_level (Level l);
+ /** @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;
-protected:
- /** mutex to protect the log */
- boost::mutex _mutex;
-
-private:
- virtual void do_log (std::string m) = 0;
-
- /** level above which to ignore log messages */
- Level _level;
-};
+protected:
-class FileLog : public Log
-{
-public:
- FileLog (std::string file);
+ /** mutex to protect the log */
+ mutable boost::mutex _mutex;
private:
private:
- void do_log (std::string m);
- /** filename to write to */
- std::string _file;
+ virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
+
+ /** bit-field of log types which should be put into the log (others are ignored) */
+ int _types;
};
#endif
};
#endif