diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-10-27 20:37:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-10-27 20:37:09 +0100 |
| commit | 4f65e645d2388c538258ef51c65182c6d0a674d8 (patch) | |
| tree | e578035c14a1c0537bd988e475da965e16800122 /src/lib/dcp_examiner.h | |
| parent | 2b6575bc67f349c396e283097ab0001382427fe0 (diff) | |
Fix incorrect reading of markers from multi-reel DCPs (#3105).
Diffstat (limited to 'src/lib/dcp_examiner.h')
| -rw-r--r-- | src/lib/dcp_examiner.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index ca3cae76e..0a6045ed0 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -163,7 +163,8 @@ public: return _reel_lengths; } - std::map<dcp::Marker, dcp::Time> markers() const { + /** @return DCP markers, with times offset from the start of the DCP */ + std::map<dcp::Marker, dcpomatic::ContentTime> markers() const { return _markers; } @@ -224,7 +225,7 @@ private: boost::optional<dcp::ContentKind> _content_kind; std::string _cpl; std::list<int64_t> _reel_lengths; - std::map<dcp::Marker, dcp::Time> _markers; + std::map<dcp::Marker, dcpomatic::ContentTime> _markers; std::vector<dcp::Rating> _ratings; std::vector<std::string> _content_versions; bool _has_atmos = false; |
