diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-01-27 23:38:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-16 01:20:17 +0100 |
| commit | 987d5bec15a752bbc3d914035e5ab34d5c9b4efe (patch) | |
| tree | 7fb367a6a5cd8d1468b2a7065518825073581128 /src/lib | |
| parent | edff38985837911f94bc31e4d82099ce1a56f4c8 (diff) | |
Remove now-unnecessary Film parameters.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/content.cc | 6 | ||||
| -rw-r--r-- | src/lib/content.h | 2 | ||||
| -rw-r--r-- | src/lib/playlist.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index a149f66d5..6ee8f4fc0 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -232,7 +232,7 @@ Content::set_position(shared_ptr<const Film> film, DCPTime p, bool force_emit) void -Content::set_trim_start(shared_ptr<const Film>, ContentTime t) +Content::set_trim_start(ContentTime t) { DCPOMATIC_ASSERT(t.get() >= 0); @@ -386,7 +386,7 @@ Content::reel_split_points(shared_ptr<const Film>) const void -Content::set_video_frame_rate(shared_ptr<const Film> film, double r) +Content::set_video_frame_rate(shared_ptr<const Film>, double r) { ContentChangeSignaller cc(this, ContentProperty::VIDEO_FRAME_RATE); @@ -400,7 +400,7 @@ Content::set_video_frame_rate(shared_ptr<const Film> film, double r) /* Make sure trim is still on a frame boundary */ if (video) { - set_trim_start(film, trim_start()); + set_trim_start(trim_start()); } } diff --git a/src/lib/content.h b/src/lib/content.h index 02973e8f7..d0cdd5a9a 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -174,7 +174,7 @@ public: return _position; } - void set_trim_start(std::shared_ptr<const Film> film, dcpomatic::ContentTime); + void set_trim_start(dcpomatic::ContentTime); dcpomatic::ContentTime trim_start() const { boost::mutex::scoped_lock lm(_mutex); diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 8c60a5458..9a292ce27 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -250,7 +250,7 @@ Playlist::set_from_xml(shared_ptr<const Film> film, cxml::ConstNodePtr node, int /* ...or have a start trim which is an integer number of frames */ auto const old_trim = content->trim_start(); - content->set_trim_start(film, old_trim); + content->set_trim_start(old_trim); if (old_trim != content->trim_start()) { string note = _("Your project contains video content whose trim was not aligned to a frame boundary."); note += " "; |