diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-19 19:59:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-09-03 00:37:34 +0200 |
| commit | 3be2a770aabfe44d33f5f7509c89dce28cf9f50d (patch) | |
| tree | 6482b6b63fa70db89ebc84318df80af476b41383 | |
| parent | 999266e837240e7f7e888058fff948b1862cc89d (diff) | |
Add and use Time::negative().
| -rw-r--r-- | src/lib/content.cc | 4 | ||||
| -rw-r--r-- | src/lib/dcpomatic_time.h | 4 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 6bb7c02c9..94011c784 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -238,7 +238,7 @@ Content::set_position(shared_ptr<const Film> film, DCPTime p, bool force_emit) void Content::set_trim_start(shared_ptr<const Film> film, ContentTime t) { - DCPOMATIC_ASSERT(t.get() >= 0); + DCPOMATIC_ASSERT(!t.negative()); /* video and audio content can modify its start trim */ @@ -267,7 +267,7 @@ Content::set_trim_start(shared_ptr<const Film> film, ContentTime t) void Content::set_trim_end(ContentTime t) { - DCPOMATIC_ASSERT(t.get() >= 0); + DCPOMATIC_ASSERT(!t.negative()); ContentChangeSignaller cc(this, ContentProperty::TRIM_END); diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h index f79242161..8382a7d95 100644 --- a/src/lib/dcpomatic_time.h +++ b/src/lib/dcpomatic_time.h @@ -212,6 +212,10 @@ public: return ::ceil (_t * double(r) / HZ); } + bool negative() const { + return _t < 0; + } + /** Split a time into hours, minutes, seconds and frames. * @param r Frames per second. * @return Split time. diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b6e350d34..9a558052a 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -420,7 +420,7 @@ VideoContent::size_after_crop() const optional<double> VideoContent::fade(shared_ptr<const Film> film, ContentTime time) const { - DCPOMATIC_ASSERT(time.get() >= 0); + DCPOMATIC_ASSERT(!time.negative()); double const vfr = _parent->active_video_frame_rate(film); |