Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index a42b1095429fd35a467685185fce2f8f50be5905..fa27f600b4df195e2f624e62d9984fe221f804f7 100644 (file)
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -32,15 +32,16 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
-       : Content (film, path)
+AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
+       : Content (path)
 {
 
 }
 
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int)
-       : Content (film, node)
+AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
+       : Content (node)
 {
 
 }
@@ -65,10 +66,10 @@ AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 }
 
 void
-AtmosMXFContent::examine (shared_ptr<Job> job)
+AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
-       Content::examine (job);
+       Content::examine (film, job);
        shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
 
        {
@@ -91,8 +92,14 @@ AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 }
 
 DCPTime
-AtmosMXFContent::full_length () const
+AtmosMXFContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
-       return DCPTime::from_frames (llrint (_length * frc.factor()), film()->video_frame_rate());
+       FrameRateChange const frc (film, shared_from_this());
+       return DCPTime::from_frames (llrint (_length * frc.factor()), film->video_frame_rate());
+}
+
+DCPTime
+AtmosMXFContent::approximate_length () const
+{
+       return DCPTime::from_frames (_length, 24);
 }