X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.h;h=d3e9b564b389fcb8787397ff43cefd6660ae1382;hb=c5a9590a9a84eb4eee8536dfa1eef59d7126eeac;hp=4c6918a4220d0d5cc39610f7d20a1e89245199cf;hpb=e0a70cd5cfb11fc2de167f3146acdd437a6faa82;p=dcpomatic.git diff --git a/src/lib/text_content.h b/src/lib/text_content.h index 4c6918a42..d3e9b564b 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -69,8 +69,8 @@ class TextContent : public ContentPart { public: TextContent (Content* parent, TextType type, TextType original_type); - TextContent (Content* parent, std::vector >); - TextContent (Content* parent, cxml::ConstNodePtr, int version); + TextContent (Content* parent, std::vector>); + TextContent (Content* parent, cxml::ConstNodePtr, int version, std::list& notes); void as_xml (xmlpp::Node *) const; std::string identifier () const; @@ -197,7 +197,7 @@ public: return _language_is_additional; } - static std::list> from_xml (Content* parent, cxml::ConstNodePtr, int version); + static std::list> from_xml (Content* parent, cxml::ConstNodePtr, int version, std::list& notes); private: friend struct ffmpeg_pts_offset_test;