diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-20 21:28:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-20 21:28:29 +0100 |
| commit | bd5e8b83a3a18787241982efdae809d4db21f65d (patch) | |
| tree | 7aeabb1f4c3094107713f0f2b068c242a76c6469 /src/lib/video_content.cc | |
| parent | cb9183ee1165802bf81c2d6c8ced860c4da718f9 (diff) | |
Remove join function; the code is long and I don't think anybody
uses it.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index d3ba6c1ab..0dba55525 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -154,56 +154,6 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio } } -VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c) - : ContentPart (parent) - , _length (0) - , _yuv (false) -{ - shared_ptr<VideoContent> ref = c[0]->video; - DCPOMATIC_ASSERT (ref); - - for (size_t i = 1; i < c.size(); ++i) { - - if (c[i]->video->size() != ref->size()) { - throw JoinError (_("Content to be joined must have the same picture size.")); - } - - if (c[i]->video->frame_type() != ref->frame_type()) { - throw JoinError (_("Content to be joined must have the same video frame type.")); - } - - if (c[i]->video->crop() != ref->crop()) { - throw JoinError (_("Content to be joined must have the same crop.")); - } - - if (c[i]->video->scale() != ref->scale()) { - throw JoinError (_("Content to be joined must have the same scale setting.")); - } - - if (c[i]->video->colour_conversion() != ref->colour_conversion()) { - throw JoinError (_("Content to be joined must have the same colour conversion.")); - } - - if (c[i]->video->fade_in() != ref->fade_in() || c[i]->video->fade_out() != ref->fade_out()) { - throw JoinError (_("Content to be joined must have the same fades.")); - } - - _length += c[i]->video->length (); - - if (c[i]->video->yuv ()) { - _yuv = true; - } - } - - _size = ref->size (); - _frame_type = ref->frame_type (); - _crop = ref->crop (); - _scale = ref->scale (); - _colour_conversion = ref->colour_conversion (); - _fade_in = ref->fade_in (); - _fade_out = ref->fade_out (); -} - void VideoContent::as_xml (xmlpp::Node* node) const { |
