diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-11-06 10:24:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-11-06 10:24:43 +0100 |
| commit | fec5d308e853b1218a983623129ac01597263f5c (patch) | |
| tree | 1e2291a7f52f96c1454934ecb34581ba0293ebb9 | |
| parent | dd6e5ef16dfedb62b8349f1884b9a0e171fbb310 (diff) | |
Add missing FFOB/LFOB markers (DoM #2886).v1.8.112
| -rw-r--r-- | src/reel_markers_asset.cc | 4 | ||||
| -rw-r--r-- | src/types.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 4 | ||||
| -rw-r--r-- | test/markers_test.cc | 6 |
4 files changed, 20 insertions, 2 deletions
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc index d71a22ec..d9dc1c3b 100644 --- a/src/reel_markers_asset.cc +++ b/src/reel_markers_asset.cc @@ -135,7 +135,9 @@ ReelMarkersAsset::equals(shared_ptr<const ReelMarkersAsset> other, EqualityOptio get(Marker::FFEC) != other->get(Marker::FFEC) || get(Marker::LFEC) != other->get(Marker::LFEC) || get(Marker::FFMC) != other->get(Marker::FFMC) || - get(Marker::LFMC) != other->get(Marker::LFMC)) { + get(Marker::LFMC) != other->get(Marker::LFMC) || + get(Marker::FFOB) != other->get(Marker::FFOB) || + get(Marker::LFOB) != other->get(Marker::LFOB)) { return false; } diff --git a/src/types.cc b/src/types.cc index e2165548..899d5c25 100644 --- a/src/types.cc +++ b/src/types.cc @@ -249,6 +249,10 @@ dcp::marker_to_string (dcp::Marker m) return "FFMC"; case Marker::LFMC: return "LFMC"; + case Marker::FFOB: + return "FFOB"; + case Marker::LFOB: + return "LFOB"; } DCP_ASSERT (false); @@ -278,6 +282,10 @@ dcp::marker_from_string (string s) return Marker::FFMC; } else if (s == "LFMC") { return Marker::LFMC; + } else if (s == "FFOB") { + return Marker::FFOB; + } else if (s == "LFOB") { + return Marker::LFOB; } DCP_ASSERT (false); diff --git a/src/types.h b/src/types.h index 65840e6d..f9698764 100644 --- a/src/types.h +++ b/src/types.h @@ -293,7 +293,9 @@ enum class Marker { FFEC, ///< first frame of end credits LFEC, ///< last frame of end credits FFMC, ///< first frame of moving credits - LFMC ///< last frame of moving credits + LFMC, ///< last frame of moving credits + FFOB, ///< first frame of ratings band + LFOB, ///< last frame of ratings band }; diff --git a/test/markers_test.cc b/test/markers_test.cc index 1d0ebbfa..ba00d3a8 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -66,6 +66,8 @@ BOOST_AUTO_TEST_CASE(markers_test) asset->set (dcp::Marker::LFEC, dcp::Time(3, 2, 8, 18, 24)); asset->set (dcp::Marker::FFMC, dcp::Time(4, 2, 8, 18, 24)); asset->set (dcp::Marker::LFMC, dcp::Time(4, 3, 8, 18, 24)); + asset->set (dcp::Marker::FFOB, dcp::Time(5, 1, 2, 11, 24)); + asset->set (dcp::Marker::LFOB, dcp::Time(9, 2, 3, 4, 24)); auto reel = make_shared<dcp::Reel>(); reel->add (asset); @@ -103,6 +105,10 @@ BOOST_AUTO_TEST_CASE(markers_test) BOOST_CHECK (markers->get (dcp::Marker::FFMC) == dcp::Time(4, 2, 8, 18, 24)); BOOST_REQUIRE (markers->get(dcp::Marker::LFMC)); BOOST_CHECK (markers->get (dcp::Marker::LFMC) == dcp::Time(4, 3, 8, 18, 24)); + BOOST_REQUIRE (markers->get(dcp::Marker::FFOB)); + BOOST_CHECK (markers->get (dcp::Marker::FFOB) == dcp::Time(5, 1, 2, 11, 24)); + BOOST_REQUIRE (markers->get(dcp::Marker::LFOB)); + BOOST_CHECK (markers->get (dcp::Marker::LFOB) == dcp::Time(9, 2, 3, 4, 24)); BOOST_CHECK (markers->equals(markers, dcp::EqualityOptions(), [](dcp::NoteType, string) {})); |