Supporters update.

[dcpomatic.git] / test / butler_test.cc

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 0422b89ad45af1a834704332497292a23ea1e620..1c59de798d47eeecd16bf63b2cd2351671287840 100644 (file)
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -32,7 +32,6 @@
 
 
 using std::make_shared;
-using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -46,9 +45,9 @@ BOOST_AUTO_TEST_CASE (butler_test1)
        film->set_name ("butler_test1");
        film->set_container (Ratio::from_id ("185"));
 
-       auto video = content_factory("test/data/flat_red.png").front();
+       auto video = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (video);
-       auto audio = content_factory("test/data/staircase.wav").front();
+       auto audio = content_factory("test/data/staircase.wav")[0];
        film->examine_and_add_content (audio);
        BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -60,7 +59,20 @@ BOOST_AUTO_TEST_CASE (butler_test1)
                map.set (i, i, 1);
        }
 
-       Butler butler (film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false);
+       Player player(film, Image::Alignment::COMPACT);
+
+       Butler butler (
+               film,
+               player,
+               map,
+               6,
+               boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
+               VideoRange::FULL,
+               Image::Alignment::COMPACT,
+               false,
+               false,
+               Butler::Audio::ENABLED
+               );
 
        BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime());
        BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
@@ -94,8 +106,19 @@ BOOST_AUTO_TEST_CASE (butler_test2)
                map.set (i, i, 1);
        }
 
+       Player player(film, Image::Alignment::COMPACT);
+
        Butler butler (
-               film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false
+               film,
+               player,
+               map,
+               6,
+               boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
+               VideoRange::FULL,
+               Image::Alignment::COMPACT,
+               false,
+               false,
+               Butler::Audio::ENABLED
                );
 
        int const audio_frames_per_video_frame = 48000 / 25;