Re-add missing audio mapping in butler for preview.

[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 870fca56ed8c5c753eeccd61bcdb69d473dc7652..2fd9ead068cf3f9130afcd0d9efe9ec486277e19 100644 (file)
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -25,14 +25,12 @@
 #include <dcp/atmos_asset.h>
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
-#include <boost/make_shared.hpp>
 
 #include "i18n.h"
 
 using std::list;
 using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
 
 AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
@@ -50,7 +48,7 @@ bool
 AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 {
        try {
-               shared_ptr<dcp::AtmosAsset> a = make_shared<dcp::AtmosAsset> (path);
+               shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path));
                return true;
        } catch (dcp::MXFFileError& e) {
 
@@ -66,7 +64,7 @@ AtmosMXFContent::examine (shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
        Content::examine (job);
-       shared_ptr<dcp::AtmosAsset> a = make_shared<dcp::AtmosAsset> (path(0));
+       shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -81,10 +79,10 @@ AtmosMXFContent::summary () const
 }
 
 void
-AtmosMXFContent::as_xml (xmlpp::Node* node) const
+AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        node->add_child("Type")->add_child_text ("AtmosMXF");
-       Content::as_xml (node);
+       Content::as_xml (node, with_paths);
 }
 
 DCPTime