projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small libdcp API change.
[dcpomatic.git]
/
test
/
import_dcp_test.cc
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index 45cd9f413e6f3e675e9304c2145add06998990c0..cd0396d075ed3ecfdcbc503c528fac15adee54d2 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
@@
-29,6
+30,7
@@
#include <dcp/cpl.h>
#include <boost/test/unit_test.hpp>
#include <dcp/cpl.h>
#include <boost/test/unit_test.hpp>
+using std::vector;
using boost::shared_ptr;
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
using boost::shared_ptr;
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
@@
-54,7
+56,8
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
dcp::EncryptedKDM kdm = A->make_kdm (
Config::instance()->decryption_chain()->leaf (),
dcp::EncryptedKDM kdm = A->make_kdm (
Config::instance()->decryption_chain()->leaf (),
- A_dcp.cpls().front()->file (),
+ vector<dcp::Certificate> (),
+ A_dcp.cpls().front()->file().get(),
dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
dcp::MODIFIED_TRANSITIONAL_1
dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
dcp::MODIFIED_TRANSITIONAL_1