diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-23 01:15:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-23 01:15:37 +0000 |
| commit | 673ba43fb66eb0dee43807501753749f144254a7 (patch) | |
| tree | 1c337ccebdc2dc6f25d76d761252976814f34d57 /src/lib/dcp_content.cc | |
| parent | e13e5cd4cfda39b0a0b77ed8036e14e15f93ec2e (diff) | |
Remove required Film from content examine.
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index c89eadc3c..ac9f82899 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -212,7 +212,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels())); audio->set_stream (as); AudioMapping m = as->mapping (); - m.make_default (film->audio_processor()); + m.make_default (film ? film->audio_processor() : 0); as->set_mapping (m); } @@ -345,6 +345,15 @@ DCPContent::full_length (shared_ptr<const Film> film) const return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate()); } +DCPTime +DCPContent::approximate_length () const +{ + if (!video) { + return DCPTime(); + } + return DCPTime::from_frames (video->length(), 24); +} + string DCPContent::identifier () const { |