diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /test/content_test.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'test/content_test.cc')
| -rw-r--r-- | test/content_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/content_test.cc b/test/content_test.cc index 398c88be2..55e34ac5f 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (content_test1) film->set_name ("content_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr<Content> content = content_factory(film, private_data / "demo_sound_bug.mkv").front (); + shared_ptr<Content> content = content_factory(private_data / "demo_sound_bug.mkv").front (); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (content_test2) { shared_ptr<Film> film = new_test_film2 ("content_test2"); - shared_ptr<Content> content = content_factory(film, "test/data/red_23976.mp4").front(); + shared_ptr<Content> content = content_factory("test/data/red_23976.mp4").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); content->set_trim_start(ContentTime::from_seconds(0.5)); @@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (content_test3) shared_ptr<Film> film = new_test_film2 ("content_test3"); film->set_sequence (false); - shared_ptr<Content> content = content_factory(film, "test/data/red_24.mp4").front(); + shared_ptr<Content> content = content_factory("test/data/red_24.mp4").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); @@ -104,15 +104,15 @@ BOOST_AUTO_TEST_CASE (content_test3) /* Position */ /* 12 frames */ - content->set_position (DCPTime::from_seconds (12.0 / 24.0)); + content->set_position (film, DCPTime::from_seconds(12.0 / 24.0)); BOOST_CHECK (content->position() == DCPTime::from_seconds (12.0 / 24.0)); /* 11.2 frames */ - content->set_position (DCPTime::from_seconds (11.2 / 24.0)); + content->set_position (film, DCPTime::from_seconds(11.2 / 24.0)); BOOST_CHECK (content->position() == DCPTime::from_seconds (11.0 / 24.0)); /* 13.9 frames */ - content->set_position (DCPTime::from_seconds (13.9 / 24.0)); + content->set_position (film, DCPTime::from_seconds(13.9 / 24.0)); BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0)); content->set_video_frame_rate (25); |