summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2026-01-27 23:55:27 +0100
committerCarl Hetherington <cth@carlh.net>2026-02-16 01:20:17 +0100
commita7a3f17e003bab57967e502b35e2f1b689a7f1cb (patch)
tree063db340ce6a742ef6a411495227d9b6ab387808 /src/lib
parent5af584d7454b87e338498ffc8692918024e0868b (diff)
Remove another unnecessary Film parameter.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/dcp_content.cc2
-rw-r--r--src/lib/ffmpeg_content.cc2
-rw-r--r--src/lib/image_content.cc2
-rw-r--r--src/lib/video_content.cc2
-rw-r--r--src/lib/video_content.h2
-rw-r--r--src/lib/video_mxf_content.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 1f1e7294b..02454fdda 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -271,7 +271,7 @@ DCPContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool toler
boost::mutex::scoped_lock lm(_mutex);
video = make_shared<VideoContent>(this);
}
- video->take_from_examiner(film, examiner);
+ video->take_from_examiner(examiner);
set_default_colour_conversion();
}
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index fbbf7aaa1..832767ad6 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -264,7 +264,7 @@ FFmpegContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool to
if (examiner->has_video()) {
video = make_shared<VideoContent>(this);
- video->take_from_examiner(film, examiner);
+ video->take_from_examiner(examiner);
}
auto first_path = path(0);
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index d7f66672e..8b9b06ab2 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -139,7 +139,7 @@ ImageContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool tol
Content::examine(film, job, tolerant);
auto examiner = make_shared<ImageExaminer>(film, shared_from_this(), job);
- video->take_from_examiner(film, examiner);
+ video->take_from_examiner(examiner);
set_default_colour_conversion ();
}
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index b979f81a6..689a0e5a3 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -295,7 +295,7 @@ VideoContent::as_xml(xmlpp::Element* element) const
}
void
-VideoContent::take_from_examiner(shared_ptr<const Film>, shared_ptr<VideoExaminer> d)
+VideoContent::take_from_examiner(shared_ptr<VideoExaminer> d)
{
/* These examiner calls could call other content methods which take a lock on the mutex */
auto const vs = d->video_size();
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 23936b768..b76954641 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -219,7 +219,7 @@ public:
void set_length(Frame);
- void take_from_examiner(std::shared_ptr<const Film> film, std::shared_ptr<VideoExaminer>);
+ void take_from_examiner(std::shared_ptr<VideoExaminer>);
void add_properties(std::list<UserProperty> &) const;
void modify_position(std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index a26c54473..ffb9c4484 100644
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -94,7 +94,7 @@ VideoMXFContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool
video.reset (new VideoContent (this));
auto examiner = make_shared<VideoMXFExaminer>(shared_from_this());
- video->take_from_examiner(film, examiner);
+ video->take_from_examiner(examiner);
video->unset_colour_conversion ();
}