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);
- 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 ());
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));
/* 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);