summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2026-01-27 23:49:24 +0100
committerCarl Hetherington <cth@carlh.net>2026-02-16 01:20:17 +0100
commit5af584d7454b87e338498ffc8692918024e0868b (patch)
treecaff06ada1c4500ab0a1f7e6a83f4e079baeab67 /src/lib
parent987d5bec15a752bbc3d914035e5ab34d5c9b4efe (diff)
Remove another unnecessary Film parameter.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/content.cc2
-rw-r--r--src/lib/content.h2
-rw-r--r--src/lib/dcp_subtitle_content.cc2
-rw-r--r--src/lib/ffmpeg_content.cc2
-rw-r--r--src/lib/video_content.cc4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index 6ee8f4fc0..710fc0edc 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -386,7 +386,7 @@ Content::reel_split_points(shared_ptr<const Film>) const
void
-Content::set_video_frame_rate(shared_ptr<const Film>, double r)
+Content::set_video_frame_rate(double r)
{
ContentChangeSignaller cc(this, ContentProperty::VIDEO_FRAME_RATE);
diff --git a/src/lib/content.h b/src/lib/content.h
index d0cdd5a9a..c9c5ad39d 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -204,7 +204,7 @@ public:
return _video_frame_rate;
}
- void set_video_frame_rate(std::shared_ptr<const Film> film, double r);
+ void set_video_frame_rate(double r);
void unset_video_frame_rate();
double active_video_frame_rate(std::shared_ptr<const Film> film) const;
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 21159fcac..795153aa9 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -66,7 +66,7 @@ DCPSubtitleContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bo
auto iop = dynamic_pointer_cast<dcp::InteropTextAsset>(subtitle_asset);
auto smpte = dynamic_pointer_cast<dcp::SMPTETextAsset>(subtitle_asset);
if (smpte) {
- set_video_frame_rate(film, smpte->edit_rate().numerator);
+ set_video_frame_rate(smpte->edit_rate().numerator);
}
boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 8207ae5f9..fbbf7aaa1 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -322,7 +322,7 @@ FFmpegContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool to
/* FFmpeg has detected this file as 29.97 and the examiner thinks it is using "soft" 2:3 pulldown (telecine).
* This means we can treat it as a 23.976fps file.
*/
- set_video_frame_rate(film, 24000.0 / 1001);
+ set_video_frame_rate(24000.0 / 1001);
video->set_length(video->length() * 24.0 / 30);
}
}
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index b6e350d34..b979f81a6 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> film, shared_ptr<VideoExaminer> d)
+VideoContent::take_from_examiner(shared_ptr<const Film>, 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();
@@ -324,7 +324,7 @@ VideoContent::take_from_examiner(shared_ptr<const Film> film, shared_ptr<VideoEx
LOG_GENERAL("Video length obtained from header as {} frames", _length);
if (d->video_frame_rate()) {
- _parent->set_video_frame_rate(film, d->video_frame_rate().get());
+ _parent->set_video_frame_rate(d->video_frame_rate().get());
}
}