Cleanup: pass EqualityOptions as const&

[libdcp.git] / src / subtitle_asset.h

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 7448ac9a0f25c72788b318a22cca58ad5585e210..e1ca5d15d8979c473c4ecabc06feb6bbe636a68f 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -44,6 +44,7 @@
 #include "array_data.h"
 #include "asset.h"
 #include "dcp_time.h"
+#include "subtitle_standard.h"
 #include "subtitle_string.h"
 #include <libcxml/cxml.h>
 #include <boost/shared_array.hpp>
@@ -100,7 +101,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset>,
-               EqualityOptions,
+               EqualityOptions const&,
                NoteHandler note
                ) const override;
 
@@ -110,6 +111,7 @@ public:
 
        virtual void add (std::shared_ptr<Subtitle>);
        virtual void add_font (std::string id, dcp::ArrayData data) = 0;
+       void ensure_font(std::string id, dcp::ArrayData data);
        std::map<std::string, ArrayData> font_data () const;
        std::map<std::string, boost::filesystem::path> font_filenames () const;
 
@@ -132,7 +134,9 @@ public:
                return _raw_xml;
        }
 
-       static std::string format_xml (xmlpp::Document const& document, std::vector<std::pair<std::string, std::string>> const& namespaces);
+       virtual SubtitleStandard subtitle_standard() const = 0;
+
+       static std::string format_xml(xmlpp::Document const& document, boost::optional<std::pair<std::string, std::string>> xml_namespace);
 
 protected:
        friend struct ::interop_dcp_font_test;