X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.h;h=3122271209deb67e33aea54d6b9e1d3c77e14ce7;hb=6d95d9689831a74fade32038a808f206c03d8aa2;hp=7c060cd482afb76fa3bdd152bb8dd178c4d2350f;hpb=1266a5149e056a17b4a9276ccf6ea4a79cc93610;p=dcpomatic.git diff --git a/src/lib/text_content.h b/src/lib/text_content.h index 7c060cd48..312227120 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -72,7 +72,7 @@ public: TextContent (Content* parent, std::vector>); TextContent (Content* parent, cxml::ConstNodePtr, int version, std::list& notes); - void as_xml (xmlpp::Node *) const; + void as_xml(xmlpp::Element*) const; std::string identifier () const; void take_settings_from (std::shared_ptr c); @@ -199,7 +199,7 @@ public: return _language_is_additional; } - static std::list> from_xml (Content* parent, cxml::ConstNodePtr, int version, std::list& notes); + static std::vector> from_xml(Content* parent, cxml::ConstNodePtr, int version, std::list& notes); private: friend struct ffmpeg_pts_offset_test;