Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index a0ad494d1bcf25cd26179cb806b1e255517a59eb..f7aa52d6f539f18102a3f68080c59f70d6cc75e7 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -44,14 +44,14 @@ public:
        PlayerWrapper (shared_ptr<Player> p)
                : _player (p)
        {
-               _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _5));
+               _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _3));
        }
 
-       void process_video (shared_ptr<PlayerVideoFrame> i, bool, Time t)
+       void process_video (shared_ptr<PlayerVideoFrame> i, Time t)
        {
                Video v;
                v.content = _player->_last_video;
-               v.image = i->image ();
+               v.image = i->image (PIX_FMT_RGB24);
                v.time = t;
                _queue.push_front (v);
        }
@@ -82,18 +82,18 @@ private:
 BOOST_AUTO_TEST_CASE (play_test)
 {
        shared_ptr<Film> film = new_test_film ("play_test");
-       film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->set_name ("play_test");
 
        shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/red_24.mp4"));
-       film->examine_and_add_content (A);
+       film->examine_and_add_content (A, true);
        wait_for_jobs ();
 
        BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16);
 
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4"));
-       film->examine_and_add_content (B);
+       film->examine_and_add_content (B, true);
        wait_for_jobs ();
 
        BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (play_test)
                }
        }
 
-       player->seek (10 * TIME_HZ / 25, true);
+       wrap.seek (10 * TIME_HZ / 25, true);
        optional<Video> v = wrap.get_video ();
        BOOST_CHECK (v);
        BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25);