Add edit_rate accessor.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 8532d6a39fad5c90e9bd79e925531de840e07431..d3f186ef965b72ad74f5fb12c2b729653360a125 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -84,7 +84,12 @@ protected:
        friend struct ::interop_dcp_font_test;
        friend struct ::smpte_dcp_font_test;
 
-       void parse_subtitles (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<FontNode> > font_nodes);
+       void parse_subtitles (
+               boost::shared_ptr<cxml::Document> xml,
+               std::list<boost::shared_ptr<FontNode> > font_nodes,
+               std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes
+               );
+
        void subtitles_as_xml (xmlpp::Element* root, int time_code_rate, Standard standard) const;
 
        /** All our subtitles, in no particular order */
@@ -127,19 +132,19 @@ private:
 
        void maybe_add_subtitle (std::string text, ParseState const & parse_state);
 
-       void examine_font_nodes (
+       void examine_nodes (
                boost::shared_ptr<const cxml::Node> xml,
                std::list<boost::shared_ptr<FontNode> > const & font_nodes,
                ParseState& parse_state
                );
 
-       void examine_text_nodes (
+       void examine_nodes (
                boost::shared_ptr<const cxml::Node> xml,
                std::list<boost::shared_ptr<TextNode> > const & text_nodes,
                ParseState& parse_state
                );
 
-       void examine_subtitle_nodes (
+       void examine_nodes (
                boost::shared_ptr<const cxml::Node> xml,
                std::list<boost::shared_ptr<SubtitleNode> > const & subtitle_nodes,
                ParseState& parse_state