std::shared_ptr

[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 5b97edcfd185fa996ba0a9340326781c37743da7..3f41a52a09e165856a43fa50e87b38b70a8620cf 100644 (file)
--- 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,13 +26,15 @@
 #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::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
 
 AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
        : Content (path)
@@ -42,7 +45,7 @@ AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
 AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
        : Content (node)
 {
-
+       atmos = AtmosContent::from_xml (this, node);
 }
 
 bool
@@ -55,7 +58,7 @@ AtmosMXFContent::valid_mxf (boost::filesystem::path path)
                return true;
        } catch (dcp::MXFFileError& e) {
 
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
 
        }
 
@@ -73,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());
        }
 }
 
@@ -88,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);
 }