diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-22 20:53:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-22 20:53:35 +0100 |
| commit | 0e3aa9dd0494d5799fa3b18be943fe14c7bbf0f3 (patch) | |
| tree | 21b16d3d2c4fadf4c1504836c6a27a686e7a54f5 /test | |
| parent | a281a3ce19e8a2ab03ed706e14c90deaa8f6dad6 (diff) | |
C++ tidying.
Diffstat (limited to 'test')
| -rw-r--r-- | test/markers_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/markers_test.cc b/test/markers_test.cc index 28c9eed42..a0f6482a8 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -44,7 +44,7 @@ using std::shared_ptr; BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1) { string const name = "automatic_ffoc_lfoc_markers_test1"; - shared_ptr<Film> film = new_test_film2 (name); + auto film = new_test_film2 (name); film->examine_and_add_content (content_factory("test/data/flat_red.png").front()); BOOST_REQUIRE (!wait_for_jobs()); @@ -55,16 +55,16 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1) dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name())); dcp.read (); BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); - shared_ptr<dcp::CPL> cpl = dcp.cpls().front(); + auto cpl = dcp.cpls().front(); BOOST_REQUIRE_EQUAL (cpl->reels().size(), 1U); - shared_ptr<dcp::Reel> reel = cpl->reels().front(); - shared_ptr<dcp::ReelMarkersAsset> markers = reel->main_markers(); + auto reel = cpl->reels()[0]; + auto markers = reel->main_markers(); BOOST_REQUIRE (markers); - optional<dcp::Time> ffoc = markers->get (dcp::Marker::FFOC); + auto ffoc = markers->get (dcp::Marker::FFOC); BOOST_REQUIRE (ffoc); BOOST_CHECK (*ffoc == dcp::Time (0, 0, 0, 0, 24)); - optional<dcp::Time> lfoc = markers->get (dcp::Marker::LFOC); + auto lfoc = markers->get (dcp::Marker::LFOC); BOOST_REQUIRE (lfoc); BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 23, 24)); } @@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1) BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2) { string const name = "automatic_ffoc_lfoc_markers_test2"; - shared_ptr<Film> film = new_test_film2 (name); + auto film = new_test_film2 (name); film->examine_and_add_content (content_factory("test/data/flat_red.png").front()); BOOST_REQUIRE (!wait_for_jobs()); @@ -87,16 +87,16 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2) dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name())); dcp.read (); BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); - shared_ptr<dcp::CPL> cpl = dcp.cpls().front(); + auto cpl = dcp.cpls().front(); BOOST_REQUIRE_EQUAL (cpl->reels().size(), 1U); - shared_ptr<dcp::Reel> reel = cpl->reels().front(); - shared_ptr<dcp::ReelMarkersAsset> markers = reel->main_markers(); + auto reel = cpl->reels()[0]; + auto markers = reel->main_markers(); BOOST_REQUIRE (markers); - optional<dcp::Time> ffoc = markers->get (dcp::Marker::FFOC); + auto ffoc = markers->get (dcp::Marker::FFOC); BOOST_REQUIRE (ffoc); BOOST_CHECK (*ffoc == dcp::Time (0, 0, 1, 0, 24)); - optional<dcp::Time> lfoc = markers->get (dcp::Marker::LFOC); + auto lfoc = markers->get (dcp::Marker::LFOC); BOOST_REQUIRE (lfoc); BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 0, 24)); } |