Remove required Film from content examine.

[dcpomatic.git] / src / lib / dcp_content.cc

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b455e7f7f63b7e4018fbc39600a1b9e78cd8de67..ac9f828996d286c20b15f849ff378dd5e5921035 100644 (file)
--- 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 ();
-               film->make_audio_mapping_default (m);
+               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
 {