diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-11-07 11:41:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-11-07 11:41:08 +0100 |
| commit | 165c38b495a5af2d57a06c3ac4c126c06597dd08 (patch) | |
| tree | 4c6f3b0839e1648967a675bb3c08b224fe26eb10 /src | |
| parent | 301af6aff4c4005749c3346caa7c087933110242 (diff) | |
| parent | fec5d308e853b1218a983623129ac01597263f5c (diff) | |
Merge remote-tracking branch 'origin/main' into v1.9.xv1.9.24
Diffstat (limited to 'src')
| -rw-r--r-- | src/reel_markers_asset.cc | 4 | ||||
| -rw-r--r-- | src/types.cc | 8 | ||||
| -rw-r--r-- | src/types.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc index df920f44..ce3891f4 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 d58256a5..2049a9a4 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 80ee8933..341236fc 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 }; |