Add video waveform dialog to player (#2226).

[dcpomatic.git] / test / markers_test.cc

diff --git a/test/markers_test.cc b/test/markers_test.cc
index a0f6482a8abc5d930d448843255860fdd85fa96f..0bbb329a0a8256e3435cb6fb13b19b646ac42a72 100644 (file)
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -45,12 +45,11 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 {
        string const name = "automatic_ffoc_lfoc_markers_test1";
        auto film = new_test_film2 (name);
-       film->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+       film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
        BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_interop (false);
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film);
 
        dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
        dcp.read ();
@@ -63,7 +62,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 
        auto ffoc = markers->get (dcp::Marker::FFOC);
        BOOST_REQUIRE (ffoc);
-       BOOST_CHECK (*ffoc == dcp::Time (0, 0, 0, 0, 24));
+       BOOST_CHECK (*ffoc == dcp::Time(0, 0, 0, 1, 24));
        auto lfoc = markers->get (dcp::Marker::LFOC);
        BOOST_REQUIRE (lfoc);
        BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 23, 24));
@@ -75,14 +74,18 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2)
 {
        string const name = "automatic_ffoc_lfoc_markers_test2";
        auto film = new_test_film2 (name);
-       film->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+       film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
        BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_interop (false);
        film->set_marker (dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1));
        film->set_marker (dcp::Marker::LFOC, dcpomatic::DCPTime::from_seconds(9));
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::INCORRECT_FFOC,
+                       dcp::VerificationNote::Code::INCORRECT_LFOC
+               });
 
        dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
        dcp.read ();