projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic template support (#485).
[dcpomatic.git]
/
src
/
lib
/
video_mxf_content.cc
diff --git
a/src/lib/video_mxf_content.cc
b/src/lib/video_mxf_content.cc
index f5fab485e023ac2103958fe5bf36ebc94b82f199..1f416312233f3efe21edae87ccfbc248abfa2d3a 100644
(file)
--- 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 <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;
#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)
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 {
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) {
return true;
} catch (dcp::MXFFileError& e) {
@@
-62,7
+60,7
@@
VideoMXFContent::valid_mxf (boost::filesystem::path path)
}
try {
}
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) {
return true;
} catch (dcp::MXFFileError& e) {
@@
-81,7
+79,7
@@
VideoMXFContent::examine (shared_ptr<Job> job)
Content::examine (job);
video.reset (new VideoContent (this));
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->take_from_examiner (examiner);
}
@@
-104,10
+102,10
@@
VideoMXFContent::identifier () const
}
void
}
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");
{
node->add_child("Type")->add_child_text ("VideoMXF");
- Content::as_xml (node);
+ Content::as_xml (node
, with_paths
);
video->as_xml (node);
}
video->as_xml (node);
}