X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_content.cc;h=325ea8e7214a460cc52e447c26e96e07cf5f4a56;hb=9fc3a67c727896d2170888ae60c9745ebbfdca95;hp=f5fab485e023ac2103958fe5bf36ebc94b82f199;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index f5fab485e..325ea8e72 100644
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -28,14 +28,12 @@
 #include <dcp/stereo_picture_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;
 
 VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
@@ -53,7 +51,7 @@ bool
 VideoMXFContent::valid_mxf (boost::filesystem::path path)
 {
 	try {
-		shared_ptr<dcp::MonoPictureAsset> mp = make_shared<dcp::MonoPictureAsset> (path);
+		shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (path));
 		return true;
 	} catch (dcp::MXFFileError& e) {
 
@@ -62,7 +60,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path)
 	}
 
 	try {
-		shared_ptr<dcp::StereoPictureAsset> sp = make_shared<dcp::StereoPictureAsset> (path);
+		shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (path));
 		return true;
 	} catch (dcp::MXFFileError& e) {
 
@@ -81,8 +79,9 @@ VideoMXFContent::examine (shared_ptr<Job> job)
 	Content::examine (job);
 
 	video.reset (new VideoContent (this));
-	shared_ptr<VideoMXFExaminer> examiner = make_shared<VideoMXFExaminer> (shared_from_this ());
+	shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ()));
 	video->take_from_examiner (examiner);
+	video->unset_colour_conversion ();
 }
 
 string
@@ -104,10 +103,10 @@ VideoMXFContent::identifier () const
 }
 
 void
-VideoMXFContent::as_xml (xmlpp::Node* node) const
+VideoMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("VideoMXF");
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 	video->as_xml (node);
 }
 
@@ -123,9 +122,3 @@ VideoMXFContent::add_properties (list<UserProperty>& p) const
 {
 	video->add_properties (p);
 }
-
-void
-VideoMXFContent::set_default_colour_conversion ()
-{
-	video->unset_colour_conversion ();
-}