Add some new channels to the enum.

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 59ed1165475a41d5ca7957f9428ced598c2508b5..b66e88b10706379f1fe84cfe47e3687c3bba5c56 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -64,7 +64,7 @@ class LoadFontNode;
 
 namespace order {
        class Part;
-       class Context;
+       struct Context;
 }
 
 /** @class SubtitleAsset
@@ -94,15 +94,22 @@ public:
 
        virtual void add (boost::shared_ptr<Subtitle>);
        virtual void add_font (std::string id, boost::filesystem::path file) = 0;
-       std::map<std::string, Data> fonts_with_load_ids () const;
+       std::map<std::string, Data> font_data () const;
+       std::map<std::string, boost::filesystem::path> font_filenames () const;
 
        virtual void write (boost::filesystem::path) const = 0;
        virtual std::string xml_as_string () const = 0;
 
        Time latest_subtitle_out () const;
 
+       void fix_empty_font_ids ();
+
        virtual std::list<boost::shared_ptr<LoadFontNode> > load_font_nodes () const = 0;
 
+       std::string raw_xml () const {
+               return _raw_xml;
+       }
+
 protected:
        friend struct ::interop_dcp_font_test;
        friend struct ::smpte_dcp_font_test;
@@ -172,6 +179,9 @@ protected:
        /** TTF font data that we need */
        std::list<Font> _fonts;
 
+       /** The raw XML data that we read from our asset; useful for validation */
+       std::string _raw_xml;
+
 private:
        friend struct ::pull_fonts_test1;
        friend struct ::pull_fonts_test2;