film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
- auto video = content_factory("test/data/flat_red.png").front();
+ auto video = content_factory("test/data/flat_red.png")[0];
film->examine_and_add_content (video);
- auto audio = content_factory("test/data/staircase.wav").front();
+ auto audio = content_factory("test/data/staircase.wav")[0];
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
map.set (i, i, 1);
}
- Butler butler (film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false);
+ Player player(film, Image::Alignment::COMPACT);
+
+ Butler butler (
+ film,
+ player,
+ map,
+ 6,
+ boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
+ VideoRange::FULL,
+ Image::Alignment::COMPACT,
+ false,
+ false,
+ Butler::Audio::ENABLED
+ );
BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime());
BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
map.set (i, i, 1);
}
+ Player player(film, Image::Alignment::COMPACT);
+
Butler butler (
- film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false
+ film,
+ player,
+ map,
+ 6,
+ boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
+ VideoRange::FULL,
+ Image::Alignment::COMPACT,
+ false,
+ false,
+ Butler::Audio::ENABLED
);
int const audio_frames_per_video_frame = 48000 / 25;