X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fatmos_mxf_content.cc;h=a42b1095429fd35a467685185fce2f8f50be5905;hb=422eb00b446d90e3588ae6793f676917ee195cca;hp=870fca56ed8c5c753eeccd61bcdb69d473dc7652;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 870fca56e..a42b10954 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -22,17 +22,16 @@
 #include "job.h"
 #include "film.h"
 #include "compose.hpp"
+#include <asdcp/KM_log.h>
 #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)
@@ -49,8 +48,10 @@ AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, cxml::ConstNodePt
 bool
 AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 {
+	Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
 	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) {
 
@@ -58,6 +59,8 @@ AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 
 	}
 
+	Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
 	return false;
 }
 
@@ -66,7 +69,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 +84,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