projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various playlist editor developments and fixes.
[dcpomatic.git]
/
test
/
remake_id_test.cc
diff --git
a/test/remake_id_test.cc
b/test/remake_id_test.cc
index ac1bfbe14dcd92198825de1905b8c50ce25d928f..2a96a148887f90e71f4dac656d780cbd61220704 100644
(file)
--- a/
test/remake_id_test.cc
+++ b/
test/remake_id_test.cc
@@
-43,7
+43,7
@@
BOOST_AUTO_TEST_CASE (remake_id_test1)
{
/* Make a DCP */
shared_ptr<Film> film = new_test_film2 ("remake_id_test1_1");
{
/* Make a DCP */
shared_ptr<Film> film = new_test_film2 ("remake_id_test1_1");
- shared_ptr<Content> content = content_factory(
film,
"test/data/flat_red.png").front();
+ shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->make_dcp ();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->make_dcp ();
@@
-67,7
+67,7
@@
BOOST_AUTO_TEST_CASE (remake_id_test2)
{
/* Make a DCP */
shared_ptr<Film> film = new_test_film2 ("remake_id_test2_1");
{
/* Make a DCP */
shared_ptr<Film> film = new_test_film2 ("remake_id_test2_1");
- shared_ptr<Content> content = content_factory(
film,
"test/data/flat_red.png").front();
+ shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
film->examine_and_add_content (content);
film->set_encrypted (true);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
film->set_encrypted (true);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-93,8
+93,8
@@
BOOST_AUTO_TEST_CASE (remake_id_test2)
Config::instance()->decryption_chain()->leaf(),
vector<string>(),
*cpl,
Config::instance()->decryption_chain()->leaf(),
vector<string>(),
*cpl,
- dcp::LocalTime ("20
12
-01-01T01:00:00+00:00"),
- dcp::LocalTime ("2
112
-01-01T01:00:00+00:00"),
+ dcp::LocalTime ("20
30
-01-01T01:00:00+00:00"),
+ dcp::LocalTime ("2
031
-01-01T01:00:00+00:00"),
dcp::MODIFIED_TRANSITIONAL_1,
true,
0
dcp::MODIFIED_TRANSITIONAL_1,
true,
0
@@
-102,7
+102,7
@@
BOOST_AUTO_TEST_CASE (remake_id_test2)
/* Import the DCP into a new film */
shared_ptr<Film> film2 = new_test_film2("remake_id_test2_2");
/* Import the DCP into a new film */
shared_ptr<Film> film2 = new_test_film2("remake_id_test2_2");
- shared_ptr<DCPContent> dcp_content(new DCPContent(film
2, film
->dir(film->dcp_name())));
+ shared_ptr<DCPContent> dcp_content(new DCPContent(film->dir(film->dcp_name())));
film2->examine_and_add_content(dcp_content);
BOOST_REQUIRE(!wait_for_jobs());
dcp_content->add_kdm(kdm);
film2->examine_and_add_content(dcp_content);
BOOST_REQUIRE(!wait_for_jobs());
dcp_content->add_kdm(kdm);