X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fplay_test.cc;h=51e2272568acbf26a1bc321d0ad1bdf63af3bc36;hb=4ec7a8070dfcda1fa327df6378eaab754f119f1b;hp=cb5b6cbb8cd2f1ff0349a9b93b211755e3b78583;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/test/play_test.cc b/test/play_test.cc index cb5b6cbb8..51e227256 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -46,11 +46,11 @@ public: _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _5)); } - void process_video (shared_ptr i, bool, Time t) + void process_video (shared_ptr i, bool, Time t) { Video v; v.content = _player->_last_video; - v.image = i; + v.image = i->image (); v.time = t; _queue.push_front (v); } @@ -89,13 +89,13 @@ BOOST_AUTO_TEST_CASE (play_test) film->examine_and_add_content (A); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->video_length(), 16); + BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16); shared_ptr B (new FFmpegContent (film, "test/data/red_30.mp4")); film->examine_and_add_content (B); wait_for_jobs (); - BOOST_CHECK_EQUAL (B->video_length(), 16); + BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16); /* Film should have been set to 25fps */ BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);