Use enum class for VideoRange.

[dcpomatic.git] / test / butler_test.cc

diff --git a/test/butler_test.cc b/test/butler_test.cc
index cc28412689937c4db139ffa0fb2f19b6f33dbe69..016767e1c321099bf729ea7ac33733567947b13c 100644 (file)
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -28,7 +28,10 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (butler_test1)
@@ -52,11 +55,11 @@ BOOST_AUTO_TEST_CASE (butler_test1)
                map.set (i, i, 1);
        }
 
-       Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false);
+       Butler butler (film, shared_ptr<Player>(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, 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];