Various playlist editor developments and fixes.

[dcpomatic.git] / test / butler_test.cc

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 0ee06c1acd694ef084457887de4efef4f96faeb9..7aeba78f952e8d13c95d8c7ef6b7a46dc5364dbd 100644 (file)
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -29,6 +29,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (butler_test1)
 {
@@ -37,9 +38,9 @@ BOOST_AUTO_TEST_CASE (butler_test1)
        film->set_name ("butler_test1");
        film->set_container (Ratio::from_id ("185"));
 
-       shared_ptr<Content> video = content_factory(film, "test/data/flat_red.png").front ();
+       shared_ptr<Content> video = content_factory("test/data/flat_red.png").front ();
        film->examine_and_add_content (video);
-       shared_ptr<Content> audio = content_factory(film, "test/data/staircase.wav").front ();
+       shared_ptr<Content> audio = content_factory("test/data/staircase.wav").front ();
        film->examine_and_add_content (audio);
        BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -51,11 +52,11 @@ BOOST_AUTO_TEST_CASE (butler_test1)
                map.set (i, i, 1);
        }
 
-       Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), film->log(), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false);
+       Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false);
 
-       BOOST_CHECK (butler.get_video().second == DCPTime());
-       BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24));
-       BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(2, 24));
+       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime());
+       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24));
+       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(2, 24));
        /* XXX: check the frame contents */
 
        float buffer[256 * 6];