Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index c1dabe620b503024b626a5625261d3d8b286d7f5..cb5b6cbb8cd2f1ff0349a9b93b211755e3b78583 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -43,7 +43,7 @@ public:
        PlayerWrapper (shared_ptr<Player> p)
                : _player (p)
        {
-               _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _4));
+               _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _5));
        }
 
        void process_video (shared_ptr<const Image> i, bool, Time t)
@@ -98,11 +98,11 @@ BOOST_AUTO_TEST_CASE (play_test)
        BOOST_CHECK_EQUAL (B->video_length(), 16);
        
        /* Film should have been set to 25fps */
-       BOOST_CHECK_EQUAL (film->dcp_video_frame_rate(), 25);
+       BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
-       BOOST_CHECK_EQUAL (A->start(), 0);
+       BOOST_CHECK_EQUAL (A->position(), 0);
        /* A is 16 frames long at 25 fps */
-       BOOST_CHECK_EQUAL (B->start(), 16 * TIME_HZ / 25);
+       BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
 
        shared_ptr<Player> player = film->make_player ();
        PlayerWrapper wrap (player);