projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing FFmpeg include; fixes #989.
[dcpomatic.git]
/
src
/
lib
/
screen_kdm.h
diff --git
a/src/lib/screen_kdm.h
b/src/lib/screen_kdm.h
index c2928114f649838a04c21ce1115e33c8a8ae3db1..60486c2593d5481ecadbbbd45df9847833e4d16b 100644
(file)
--- a/
src/lib/screen_kdm.h
+++ b/
src/lib/screen_kdm.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
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/>.
*/
*/
@@
-21,10
+22,10
@@
#define DCPOMATIC_SCREEN_KDM_H
#include <dcp/encrypted_kdm.h>
#define DCPOMATIC_SCREEN_KDM_H
#include <dcp/encrypted_kdm.h>
+#include <dcp/name_format.h>
#include <boost/shared_ptr.hpp>
class Screen;
#include <boost/shared_ptr.hpp>
class Screen;
-class Film;
/** Simple class to collect a screen and an encrypted KDM */
class ScreenKDM
/** Simple class to collect a screen and an encrypted KDM */
class ScreenKDM
@@
-35,9
+36,10
@@
public:
, kdm (k)
{}
, kdm (k)
{}
- std::string filename (boost::shared_ptr<const Film> film) const;
-
- static void write_files (boost::shared_ptr<const Film> film, std::list<ScreenKDM> screen_kdms, boost::filesystem::path directory);
+ static void write_files (
+ std::list<ScreenKDM> screen_kdms, boost::filesystem::path directory,
+ dcp::NameFormat name_format, dcp::NameFormat::Map name_values
+ );
boost::shared_ptr<Screen> screen;
dcp::EncryptedKDM kdm;
boost::shared_ptr<Screen> screen;
dcp::EncryptedKDM kdm;