diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-15 16:17:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-15 16:17:01 +0200 |
| commit | 4219d4b76c5cd5690b1f4fa0c248d93ced26d05a (patch) | |
| tree | 6266573a3a26dd9f432d6bd096a2c6bbd85bf6c4 /test/empty_test.cc | |
| parent | 39dcdd18487d5d1e20f0343fe617ed5bf44c1387 (diff) | |
Fix length of player output so it can be either the film's length or playlist's length, as appropriate.
Diffstat (limited to 'test/empty_test.cc')
| -rw-r--r-- | test/empty_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/empty_test.cc b/test/empty_test.cc index 1a4d03300..029e83966 100644 --- a/test/empty_test.cc +++ b/test/empty_test.cc @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (empty_test1) contentB->video->set_length (1); contentB->set_position (film, DCPTime::from_frames (7, vfr)); - Empty black (film, film->playlist(), bind(&has_video, _1)); + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); BOOST_REQUIRE_EQUAL (black._periods.size(), 2); list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin(); BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr)); @@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (empty_test2) contentB->video->set_length (1); contentB->set_position (film, DCPTime::from_frames(7, vfr)); - Empty black (film, film->playlist(), bind(&has_video, _1)); + Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film)); BOOST_REQUIRE_EQUAL (black._periods.size(), 1); BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr)); BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr)); @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (empty_test3) shared_ptr<Playlist> playlist (new Playlist); playlist->add (film, contentB); - Empty black (film, playlist, bind(&has_video, _1)); + Empty black (film, playlist, bind(&has_video, _1), playlist->length(film)); BOOST_REQUIRE_EQUAL (black._periods.size(), 1); BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr)); BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr)); |