diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-21 21:47:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-21 21:47:25 +0100 |
| commit | 6199e090dc1e32d3753ba7e7d7ea8c5f0d79f046 (patch) | |
| tree | b09d9b6b19dadb694590981775a61f829b6f3622 /src/lib/video_content.h | |
| parent | cbd4450197a083bf58bda510e626f73ba583cb66 (diff) | |
Revert "Remove join function; the code is long and I don't think anybody"
It turns out Carsten uses it :)
This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 1fc87bb9b..774210c13 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -52,6 +52,7 @@ class VideoContent : public ContentPart, public boost::enable_shared_from_this<V { public: explicit VideoContent (Content* parent); + VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; |