Remove join function; the code is long and I don't think anybody

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d3ba6c1ab1f3d50d89806290b8eb8ed12b2b54aa..0dba555251465b1b77ed5af9326f3b0246c52a5e 100644 (file)
--- 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
 {