using std::make_shared;
-using std::pair;
-using std::shared_ptr;
-using boost::optional;
+using std::make_shared;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
auto butler = std::make_shared<Butler>(
film,
- shared_ptr<Player>(new Player(film)),
+ make_shared<Player>(film, Image::Alignment::PADDED),
AudioMapping(6, 6),
6,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
VideoRange::FULL,
- false,
- true
+ Image::Alignment::PADDED,
+ true,
+ false
);
auto audio_buffer = new float[2000 * 6];
while (true) {
- auto p = butler->get_video (true, 0);
+ auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0);
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
- butler->get_audio (audio_buffer, 2000);
- p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true);
+ butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000);
+ p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
}
delete[] audio_buffer;
}