diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-01-27 23:27:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-16 01:20:17 +0100 |
| commit | edff38985837911f94bc31e4d82099ce1a56f4c8 (patch) | |
| tree | 2b5afc95cb7dbfe3fbd21136ff9969dd34b40a60 /src | |
| parent | 1f4f56b4d5e3d08be5ff823c9890a8b4e0af5967 (diff) | |
Use a best guess for DCP audio rate to avoid passing in a Film.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/audio_content.cc | 8 | ||||
| -rw-r--r-- | src/lib/audio_content.h | 2 | ||||
| -rw-r--r-- | src/lib/content.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 50601fc58..0220a3012 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -398,13 +398,13 @@ AudioContent::modify_position(shared_ptr<const Film> film, DCPTime& pos) const void -AudioContent::modify_trim_start(shared_ptr<const Film> film, ContentTime& trim) const +AudioContent::modify_trim_start(ContentTime& trim) const { /* When this trim is used it the audio will have been resampled, and using the - * DCP rate here reduces the chance of rounding errors causing audio glitches - * due to errors in placement of audio frames (#2373). + * lowest allowed DCP rate here reduces the chance of rounding errors causing + * audio glitches due to errors in placement of audio frames (#2373). */ - trim = trim.round(film ? film->audio_frame_rate() : 48000); + trim = trim.round(48000); } diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index 1b96b1af0..08d11d7fe 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -103,7 +103,7 @@ public: void add_properties(std::shared_ptr<const Film> film, std::list<UserProperty> &) const; void modify_position(std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const; - void modify_trim_start(std::shared_ptr<const Film> film, dcpomatic::ContentTime& pos) const; + void modify_trim_start(dcpomatic::ContentTime& pos) const; /** @param frame frame within the whole (untrimmed) content. * @param frame_rate The frame rate of the audio (it may have been resampled). diff --git a/src/lib/content.cc b/src/lib/content.cc index 8f486380a..a149f66d5 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> film, ContentTime t) +Content::set_trim_start(shared_ptr<const Film>, ContentTime t) { DCPOMATIC_ASSERT(t.get() >= 0); @@ -244,7 +244,7 @@ Content::set_trim_start(shared_ptr<const Film> film, ContentTime t) /* See note in ::set_position */ if (!video && audio) { - audio->modify_trim_start(film, t); + audio->modify_trim_start(t); } ContentChangeSignaller cc(this, ContentProperty::TRIM_START); |