diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 02:54:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | a4ad6395a27e8ccb25af3b05f815d318312ae1b7 (patch) | |
| tree | c2a8d4e8da5fe538cae5ca27aa9204a89412a5e3 /test | |
| parent | a4c215fa859ed7826b3c12eadc2da75c93875f4f (diff) | |
Fix Player::overlaps for the new world order.
Diffstat (limited to 'test')
| -rw-r--r-- | test/player_test.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/test/player_test.cc b/test/player_test.cc index 12e928a35..842c4b3a9 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -35,6 +35,12 @@ using std::cout; using std::list; using boost::shared_ptr; +static bool +valid (Content const *) +{ + return true; +} + /** Player::overlaps */ BOOST_AUTO_TEST_CASE (player_overlaps_test) { @@ -59,23 +65,23 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test) shared_ptr<Player> player (new Player (film, film->playlist ())); - list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5)); + list<shared_ptr<Piece> > o = player->overlaps (DCPTime::from_seconds (0), DCPTime::from_seconds (5), &valid); BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, A); - o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8)); + o = player->overlaps (DCPTime::from_seconds (5), DCPTime::from_seconds (8), &valid); BOOST_CHECK_EQUAL (o.size(), 0U); - o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12)); + o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (12), &valid); BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, B); - o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12)); + o = player->overlaps (DCPTime::from_seconds (2), DCPTime::from_seconds (12), &valid); BOOST_CHECK_EQUAL (o.size(), 2U); BOOST_CHECK_EQUAL (o.front()->content, A); BOOST_CHECK_EQUAL (o.back()->content, B); - o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11)); + o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (11), &valid); BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, B); } |