film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
{
- shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png"));
+ auto c = make_shared<ImageContent>("test/data/flat_red.png");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
- shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png"));
+ auto c = make_shared<ImageContent>("test/data/flat_green.png");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
- shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png"));
+ auto c = make_shared<ImageContent>("test/data/flat_blue.png");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
/* 4 piece of 1s-long content */
shared_ptr<ImageContent> content[4];
for (int i = 0; i < 4; ++i) {
- content[i].reset (new ImageContent("test/data/flat_green.png"));
+ content[i] = make_shared<ImageContent>("test/data/flat_green.png");
film->examine_and_add_content (content[i]);
BOOST_REQUIRE (!wait_for_jobs());
content[i]->video->set_length (24);
BOOST_AUTO_TEST_CASE (reels_test5)
{
auto dcp = make_shared<DCPContent>("test/data/reels_test4");
+ dcp->check_font_ids();
auto film = new_test_film2 ("reels_test5", {dcp});
film->set_sequence (false);
}
{
- dcp->set_trim_start (ContentTime::from_seconds (0.5));
+ dcp->set_trim_start(film, ContentTime::from_seconds(0.5));
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 4U);
auto i = p.begin();
}
{
- dcp->set_trim_start (ContentTime::from_seconds (1.5));
+ dcp->set_trim_start(film, ContentTime::from_seconds(1.5));
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 3U);
auto i = p.begin();
*/
BOOST_AUTO_TEST_CASE (reels_test7)
{
- auto A = content_factory("test/data/flat_red.png").front();
- auto B = content_factory("test/data/awkward_length.wav").front();
+ auto A = content_factory("test/data/flat_red.png")[0];
+ auto B = content_factory("test/data/awkward_length.wav")[0];
auto film = new_test_film2 ("reels_test7", { A, B });
film->set_video_frame_rate (24);
A->video->set_length (2 * 24);
make_and_verify_dcp (film);
auto B = make_shared<DCPContent>(film->dir(film->dcp_name()));
- auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml").front()});
+ auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")[0]});
B->set_reference_video(true);
B->set_reference_audio(true);
film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
/* Now try to make the VF; this used to fail */
auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
- auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt").front()});
+ auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")[0]});
vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
ov_dcp->set_reference_video (true);
ov_dcp->set_reference_audio (true);
auto film = new_test_film2 ("reels_test11", {A});
film->set_video_frame_rate (24);
A->video->set_length (240);
- A->set_video_frame_rate (24);
+ A->set_video_frame_rate(film, 24);
A->set_position (film, DCPTime::from_seconds(1));
film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
make_and_verify_dcp (film);
film->set_sequence (false);
A->video->set_length (240);
- A->set_video_frame_rate (24);
+ A->set_video_frame_rate(film, 24);
A->set_position (film, DCPTime::from_seconds(1));
B->video->set_length (120);
- B->set_video_frame_rate (24);
+ B->set_video_frame_rate(film, 24);
B->set_position (film, DCPTime::from_seconds(14));
auto r = film->reels ();
make_and_verify_dcp (film);
vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
- auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+ auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
dump_notes (notes);
BOOST_REQUIRE (notes.empty());
}
make_and_verify_dcp (film);
vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
- auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+ auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
dump_notes (notes);
BOOST_REQUIRE (notes.empty());
}
make_and_verify_dcp (film);
- auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+ auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
dump_notes (notes);
BOOST_REQUIRE (notes.empty());
}
BOOST_REQUIRE (!wait_for_jobs());
vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) };
- auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd());
+ auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd());
dump_notes (notes);
BOOST_REQUIRE (notes.empty());
}
for (int i = 0; i < 4; ++i) {
original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate));
- original_dcp[i]->set_trim_start(ContentTime::from_frames(total_frames * i / 4, frame_rate));
+ original_dcp[i]->set_trim_start(film2, ContentTime::from_frames(total_frames * i / 4, frame_rate));
original_dcp[i]->set_trim_end (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate));
original_dcp[i]->set_reference_video(true);
original_dcp[i]->set_reference_audio(true);