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/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/content.h')
| -rw-r--r-- | src/lib/content.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index 2a249011a..d84f636fb 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -67,6 +67,7 @@ public: Content (boost::shared_ptr<const Film>, DCPTime); Content (boost::shared_ptr<const Film>, boost::filesystem::path); Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr); + Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >); virtual ~Content () {} /** Examine the content to establish digest, frame rates and any other |