X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fatmos_mxf_content.cc;h=82c20e88f7bd8e7c723e49216b1d4aeeabe3bc4d;hb=969906f2dd6c5c144781861f53e2a0f6baefb9a3;hp=8300c2cd6e4e9026fefe9efa731e56682aeb0d87;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 8300c2cd6..82c20e88f 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,27 @@
 
 */
 
+
+#include "atmos_content.h"
 #include "atmos_mxf_content.h"
-#include "job.h"
-#include "film.h"
 #include "compose.hpp"
+#include "film.h"
+#include "job.h"
 #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"
 
+
 using std::list;
+using std::make_shared;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
+
 
 AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
 	: Content (path)
@@ -39,23 +46,25 @@ AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
 
 }
 
+
 AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
 	: Content (node)
 {
-
+	atmos = AtmosContent::from_xml (this, node);
 }
 
+
 bool
 AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 {
 	Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
 
 	try {
-		shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path));
+		dcp::AtmosAsset a (path);
 		return true;
 	} catch (dcp::MXFFileError& e) {
 
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 
 	}
 
@@ -64,35 +73,49 @@ AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 	return false;
 }
 
+
 void
 AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
 	Content::examine (film, job);
-	shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
+	auto a = make_shared<dcp::AtmosAsset>(path(0));
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_length = a->intrinsic_duration ();
+		atmos = make_shared<AtmosContent>(this);
+		atmos->set_length (a->intrinsic_duration());
+		atmos->set_edit_rate (a->edit_rate());
 	}
 }
 
+
 string
 AtmosMXFContent::summary () const
 {
 	return String::compose (_("%1 [Atmos]"), path_summary());
 }
 
+
 void
 AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
-	node->add_child("Type")->add_child_text ("AtmosMXF");
+	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 (active_video_frame_rate(film), 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(atmos->length() * frc.factor()), film->video_frame_rate());
+}
+
+
+DCPTime
+AtmosMXFContent::approximate_length () const
+{
+	return DCPTime::from_frames (atmos->length(), 24);
 }