diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 09:14:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-29 20:53:49 +0200 |
| commit | 39fb8198febde1937019db1c300ec363aab5aa56 (patch) | |
| tree | 52bc32134e8ae2b5587b3a62130baa9acf815b60 /test/butler_test.cc | |
| parent | b249700e1da7dd6631a8b4440587f4093a2bdef1 (diff) | |
C++11 tidying.
Diffstat (limited to 'test/butler_test.cc')
| -rw-r--r-- | test/butler_test.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index 016767e1c..dbd7a287e 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "lib/butler.h" #include "lib/film.h" #include "lib/dcp_content_type.h" @@ -28,34 +29,37 @@ #include "test.h" #include <boost/test/unit_test.hpp> + +using std::make_shared; using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif using namespace dcpomatic; + BOOST_AUTO_TEST_CASE (butler_test1) { - shared_ptr<Film> film = new_test_film ("butler_test1"); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); + auto film = new_test_film ("butler_test1"); + film->set_dcp_content_type (DCPContentType::from_isdcf_name("FTR")); film->set_name ("butler_test1"); film->set_container (Ratio::from_id ("185")); - shared_ptr<Content> video = content_factory("test/data/flat_red.png").front (); + auto video = content_factory("test/data/flat_red.png").front(); film->examine_and_add_content (video); - shared_ptr<Content> audio = content_factory("test/data/staircase.wav").front (); + auto audio = content_factory("test/data/staircase.wav").front(); film->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs ()); film->set_audio_channels (6); /* This is the map of the player output (5.1) to the butler output (also 5.1) */ - AudioMapping map = AudioMapping (6, 6); + auto map = AudioMapping (6, 6); for (int i = 0; i < 6; ++i) { map.set (i, i, 1); } - Butler butler (film, shared_ptr<Player>(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, false); + Butler butler (film, make_shared<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)); @@ -63,7 +67,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) /* XXX: check the frame contents */ float buffer[256 * 6]; - BOOST_REQUIRE (butler.get_audio (buffer, 256) == DCPTime()); + BOOST_REQUIRE (butler.get_audio(buffer, 256) == DCPTime()); for (int i = 0; i < 256; ++i) { BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0); BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0); |