/** Make an encrypted DCP, import it and make a new unencrypted DCP */
BOOST_AUTO_TEST_CASE (import_dcp_test)
{
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
BOOST_AUTO_TEST_CASE (import_dcp_test)
{
A->set_container (Ratio::from_id ("185"));
A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
A->set_name ("frobozz");
A->set_interop (false);
A->set_container (Ratio::from_id ("185"));
A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
A->set_name ("frobozz");
A->set_interop (false);
Config::instance()->decryption_chain()->leaf (),
vector<string>(),
A_dcp.cpls().front()->file().get(),
dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
Config::instance()->decryption_chain()->leaf (),
vector<string>(),
A_dcp.cpls().front()->file().get(),
dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
B->set_container (Ratio::from_id ("185"));
B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
B->set_name ("frobozz");
B->set_interop (false);
B->set_container (Ratio::from_id ("185"));
B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
B->set_name ("frobozz");
B->set_interop (false);
/* Should be 1s red, 1s green, 1s blue */
check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
/* Should be 1s red, 1s green, 1s blue */
check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
- shared_ptr<Film> film = new_test_film2 ("import_dcp_markers_test");
- shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
- film->examine_and_add_content (content);
- BOOST_REQUIRE (!wait_for_jobs());
+ auto content = content_factory("test/data/flat_red.png").front();
+ auto film = new_test_film2 ("import_dcp_markers_test", {content}, &cl);
film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4));
film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99));
film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4));
film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99));
- shared_ptr<Film> film2 = new_test_film2 ("import_dcp_markers_test2");
- shared_ptr<DCPContent> imported (new DCPContent(film->dir(film->dcp_name())));
- film2->examine_and_add_content (imported);
- BOOST_REQUIRE (!wait_for_jobs());
+ auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
+ auto film2 = new_test_film2 ("import_dcp_markers_test2", {imported}, &cl);
- map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
- BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end());
- BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000));
+ auto markers = imported->markers();
BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
/* Load that film and check that the markers have been loaded */
BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
/* Load that film and check that the markers have been loaded */
BOOST_REQUIRE (reloaded);
BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U);
markers = reloaded->markers();
BOOST_REQUIRE (reloaded);
BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U);
markers = reloaded->markers();
BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
{
/* Make a DCP with some ratings and a content version */
BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
{
/* Make a DCP with some ratings and a content version */
- shared_ptr<Film> film = new_test_film2 ("import_dcp_metadata_test");
- shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
+ auto film = new_test_film2 ("import_dcp_metadata_test");
+ auto content = content_factory("test/data/flat_red.png").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
content->video->set_length (10);
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
content->video->set_length (10);
- std::vector<dcp::Rating> ratings;
- ratings.push_back (dcp::Rating("BBFC", "15"));
- ratings.push_back (dcp::Rating("MPAA", "NC-17"));
+ vector<dcp::Rating> ratings = { {"BBFC", "15"}, {"MPAA", "NC-17"} };
- shared_ptr<Film> film2 = new_test_film2 ("import_dcp_metadata_test2");
- shared_ptr<DCPContent> imported (new DCPContent(film->dir(film->dcp_name())));
+ auto film2 = new_test_film2 ("import_dcp_metadata_test2");
+ auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
film2->examine_and_add_content (imported);
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
film2->examine_and_add_content (imported);
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
BOOST_CHECK (imported->content_versions() == cv);
/* Load that film and check that the metadata has been loaded */
BOOST_CHECK (imported->content_versions() == cv);
/* Load that film and check that the metadata has been loaded */