Various alignment tidying/fixups.

[dcpomatic.git] / test / dcp_playback_test.cc

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index efe7138e1173f7718aed67af2b62be3ec9e4a036..6c2b0447ca0edaf5b7df1d2dd09e4181750a1105 100644 (file)
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,9 +28,7 @@
 
 
 using std::make_shared;
-using std::pair;
-using std::shared_ptr;
-using boost::optional;
+using std::make_shared;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -47,12 +45,12 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 
        auto butler = std::make_shared<Butler>(
                film,
-               shared_ptr<Player>(new Player(film)),
+               make_shared<Player>(film, Image::Alignment::COMPACT),
                AudioMapping(6, 6),
                6,
                bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
                VideoRange::FULL,
-               false,
+               Image::Alignment::COMPACT,
                true,
                false
                );
@@ -65,7 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
                }
                /* assuming DCP is 24fps/48kHz */
                butler->get_audio (audio_buffer, 2000);
-               p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true);
+               p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
        }
        delete[] audio_buffer;
 }