projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
lib
/
file_log.cc
diff --git
a/src/lib/file_log.cc
b/src/lib/file_log.cc
index 1557bbd944eeb1633fd2b30efb53199f5a5e07b2..f6eaa58f8ebaf85b4e02630fee9ab869f91115c2 100644
(file)
--- a/
src/lib/file_log.cc
+++ b/
src/lib/file_log.cc
@@
-1,24
+1,26
@@
/*
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/>.
*/
#include "file_log.h"
#include "cross.h"
*/
#include "file_log.h"
#include "cross.h"
+#include "config.h"
#include <cstdio>
#include <iostream>
#include <cstdio>
#include <iostream>
@@
-31,7
+33,7
@@
using boost::shared_ptr;
FileLog::FileLog (boost::filesystem::path file)
: _file (file)
{
FileLog::FileLog (boost::filesystem::path file)
: _file (file)
{
-
+ set_types (Config::instance()->log_types());
}
void
}
void