Merge branch 'master' into 2.0--libdcp-1.0

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index c9486d161dd3cb686d318e0e2f5fe932a6cd2ed7..54fe2699f7fd47b19ad9ac666a70857e309d4567 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -50,7 +50,7 @@ public:
        {
                Video v;
                v.content = _player->_last_video;
-               v.image = i->image ();
+               v.image = i->image (PIX_FMT_RGB24, false);
                v.time = t;
                _queue.push_front (v);
        }
@@ -106,8 +106,6 @@ BOOST_AUTO_TEST_CASE (play_test)
 
        shared_ptr<Player> player = film->make_player ();
        PlayerWrapper wrap (player);
-       /* Seek and audio don't get on at the moment */
-       player->disable_audio ();
 
        for (int i = 0; i < 32; ++i) {
                optional<Video> v = wrap.get_video ();
@@ -119,10 +117,10 @@ BOOST_AUTO_TEST_CASE (play_test)
                }
        }
 
-       player->seek (10 * TIME_HZ / 25, true);
+       player->seek (6 * TIME_HZ / 25, true);
        optional<Video> v = wrap.get_video ();
        BOOST_CHECK (v);
-       BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25);
+       BOOST_CHECK_EQUAL (v.get().time, 6 * TIME_HZ / 25);
 }
 
 #endif