X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fatmos_mxf_content.cc;h=3f41a52a09e165856a43fa50e87b38b70a8620cf;hb=3b78e9223c9be784531475acacb88b59b2459f48;hp=4c1201c70fa649d913bdecc61343cd38e51edf17;hpb=fcaab33dee470c02a4988aa4317e14de7d4690c9;p=dcpomatic.git
diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 4c1201c70..3f41a52a0 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -18,6 +18,7 @@
*/
+#include "atmos_content.h"
#include "atmos_mxf_content.h"
#include "job.h"
#include "film.h"
@@ -32,7 +33,7 @@
using std::list;
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
using namespace dcpomatic;
AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
@@ -44,10 +45,7 @@ AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
: Content (node)
{
- /* This was mistakenly left out for a while, so make sure we at least don't
- * crash if an old Film is loaded.
- */
- _length = node->optional_number_child("Length").get_value_or(0);
+ atmos = AtmosContent::from_xml (this, node);
}
bool
@@ -78,7 +76,9 @@ AtmosMXFContent::examine (shared_ptr film, shared_ptr 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());
}
}
@@ -93,18 +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);
- node->add_child("Length")->add_child_text(dcp::raw_convert(_length));
+ atmos->as_xml (node);
}
DCPTime
AtmosMXFContent::full_length (shared_ptr 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);
}