using std::string;
using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
/** Check for bug #1126 whereby making a new DCP using the same video asset as an old one
* corrupts the old one.
{
/* 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 ();
{
/* 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 ());
/* Make a DKDM */
dcp::EncryptedKDM kdm = film->make_kdm (
Config::instance()->decryption_chain()->leaf(),
- vector<dcp::Certificate>(),
+ vector<string>(),
*cpl,
- dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
- dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
- dcp::MODIFIED_TRANSITIONAL_1,
+ dcp::LocalTime ("2030-01-01T01:00:00+00:00"),
+ dcp::LocalTime ("2031-01-01T01:00:00+00:00"),
+ dcp::Formulation::MODIFIED_TRANSITIONAL_1,
true,
0
);
/* 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(film2, 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);