X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fatmos_mxf_content.cc;h=36ae8871a774183f57b5b0e67e2b3451e1f5cc82;hb=44da1840ca17d0945cb1886bb17218990850894c;hp=581b1b2f06c0efe0c13b19da9220356d399fe466;hpb=b029cb06c4e0fca1fad9fecd78939efe5532fa9a;p=dcpomatic.git

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 581b1b2f0..36ae8871a 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+#include "atmos_content.h"
 #include "atmos_mxf_content.h"
 #include "job.h"
 #include "film.h"
@@ -25,6 +26,7 @@
 #include <asdcp/KM_log.h>
 #include <dcp/atmos_asset.h>
 #include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 
 #include "i18n.h"
@@ -43,7 +45,7 @@ AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
 AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
 	: Content (node)
 {
-
+	atmos = AtmosContent::from_xml (this, node);
 }
 
 bool
@@ -74,7 +76,9 @@ AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_length = a->intrinsic_duration ();
+		atmos.reset (new AtmosContent(this));
+		atmos->set_length (a->intrinsic_duration());
+		atmos->set_edit_rate (a->edit_rate());
 	}
 }
 
@@ -89,17 +93,18 @@ AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("AtmosMXF");
 	Content::as_xml (node, with_paths);
+	atmos->as_xml (node);
 }
 
 DCPTime
 AtmosMXFContent::full_length (shared_ptr<const Film> film) const
 {
 	FrameRateChange const frc (film, shared_from_this());
-	return DCPTime::from_frames (llrint (_length * frc.factor()), film->video_frame_rate());
+	return DCPTime::from_frames (llrint (atmos->length() * frc.factor()), film->video_frame_rate());
 }
 
 DCPTime
 AtmosMXFContent::approximate_length () const
 {
-	return DCPTime::from_frames (_length, 24);
+	return DCPTime::from_frames (atmos->length(), 24);
 }