projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add and use SPL::swap().
[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 c7ee69d8932c647b62835ef5d12b5a82ab0ea391..9adca5a2da33d40d91f5312f5ccb9918df006206 100644
(file)
--- a/
src/lib/video_mxf_content.cc
+++ b/
src/lib/video_mxf_content.cc
@@
-51,7
+51,7
@@
VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
: Content (node)
{
VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
: Content (node)
{
- video = VideoContent::from_xml (this, node, version);
+ video = VideoContent::from_xml (this, node, version
, VideoRange::FULL
);
}
}
@@
-94,7
+94,7
@@
VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
video.reset (new VideoContent (this));
auto examiner = make_shared<VideoMXFExaminer>(shared_from_this());
video.reset (new VideoContent (this));
auto examiner = make_shared<VideoMXFExaminer>(shared_from_this());
- video->take_from_examiner
(
examiner);
+ video->take_from_examiner
(film,
examiner);
video->unset_colour_conversion ();
}
video->unset_colour_conversion ();
}