X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fbutler_test.cc;h=016767e1c321099bf729ea7ac33733567947b13c;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=9340ebe75862336dc3315273f0ea569ac926e1be;hpb=5b6b01ea778064a0b0125ea8ebd9272a534cccd2;p=dcpomatic.git diff --git a/test/butler_test.cc b/test/butler_test.cc index 9340ebe75..016767e1c 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -28,7 +28,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (film, shared_ptr(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, false); + Butler butler (film, shared_ptr(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, false); BOOST_CHECK (butler.get_video(true, 0).second == DCPTime()); BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24));