projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up previous.
[dcpomatic.git]
/
test
/
butler_test.cc
diff --git
a/test/butler_test.cc
b/test/butler_test.cc
index dae098e308eb339f6dcfe2e8b7d1d6ec06bc7ffc..93e141c42ff199fc74970063cc53d3f53edba725 100644
(file)
--- a/
test/butler_test.cc
+++ b/
test/butler_test.cc
@@
-37,9
+37,9
@@
BOOST_AUTO_TEST_CASE (butler_test1)
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
- shared_ptr<Content> video = content_factory(
film,
"test/data/flat_red.png").front ();
+ shared_ptr<Content> video = content_factory("test/data/flat_red.png").front ();
film->examine_and_add_content (video);
film->examine_and_add_content (video);
- shared_ptr<Content> audio = content_factory(
film,
"test/data/staircase.wav").front ();
+ shared_ptr<Content> audio = content_factory("test/data/staircase.wav").front ();
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-51,7
+51,7
@@
BOOST_AUTO_TEST_CASE (butler_test1)
map.set (i, i, 1);
}
map.set (i, i, 1);
}
- Butler butler (shared_ptr<Player>(new Player(film, film->playlist())),
film->log(), map, 6
);
+ Butler butler (shared_ptr<Player>(new Player(film, film->playlist())),
map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false
);
BOOST_CHECK (butler.get_video().second == DCPTime());
BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24));
BOOST_CHECK (butler.get_video().second == DCPTime());
BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24));
@@
-59,7
+59,7
@@
BOOST_AUTO_TEST_CASE (butler_test1)
/* XXX: check the frame contents */
float buffer[256 * 6];
/* XXX: check the frame contents */
float buffer[256 * 6];
- BOOST_REQUIRE (
!butler.get_audio (buffer, 256
));
+ BOOST_REQUIRE (
butler.get_audio (buffer, 256) == DCPTime(
));
for (int i = 0; i < 256; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);
for (int i = 0; i < 256; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);