projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "Remove join function; the code is long and I don't think anybody"
[dcpomatic.git]
/
src
/
lib
/
caption_content.h
diff --git
a/src/lib/caption_content.h
b/src/lib/caption_content.h
index 4152dc533678e195b7cc5be62d01a7f1699e7f26..767fc7234446728ab6ff4a66c9693eea711584d4 100644
(file)
--- a/
src/lib/caption_content.h
+++ b/
src/lib/caption_content.h
@@
-59,6
+59,7
@@
class CaptionContent : public ContentPart
{
public:
explicit CaptionContent (Content* parent);
+ CaptionContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
std::string identifier () const;