Wrap path/data in a struct.

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 375427d93f71d57897da277f392b668dfce4f6d9..f3fbc68972d0885675ae1d19c1f05773084fee10 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -38,7 +38,7 @@ Font::Font (cxml::NodePtr node)
        for (auto i: node->node_children("File")) {
                string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
                if (variant == "Normal") {
-                       _file = i->content();
+                       _content.file = i->content();
                }
        }
 }
@@ -48,8 +48,8 @@ void
 Font::as_xml (xmlpp::Node* node)
 {
        node->add_child("Id")->add_child_text(_id);
-       if (_file) {
-               node->add_child("File")->add_child_text(_file->string());
+       if (_content.file) {
+               node->add_child("File")->add_child_text(_content.file->string());
        }
 }
 
@@ -61,6 +61,11 @@ dcpomatic::operator== (Font const & a, Font const & b)
                return false;
        }
 
+       /* XXX: it's dubious that this ignores _data, though I think it's OK for the cases
+        * where operator== is used.  Perhaps we should remove operator== and have a more
+        * specific comparator.
+        */
+
        return a.file() == b.file();
 }
 
@@ -75,12 +80,12 @@ dcpomatic::operator!= (Font const & a, Font const & b)
 optional<dcp::ArrayData>
 Font::data () const
 {
-       if (_data) {
-               return _data;
+       if (_content.data) {
+               return _content.data;
        }
 
-       if (_file) {
-               return dcp::ArrayData(*_file);
+       if (_content.file) {
+               return dcp::ArrayData(*_content.file);
        }
 
        return {};

diff --git a/src/lib/font.h b/src/lib/font.h
index 55c4249cc9b07361b38b5a7b29c03523ceb85aed..b9e90f65e07e0052df4d5f4afa7da5f52c1c7e03 100644 (file)
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -44,13 +44,15 @@ public:
 
        Font (std::string id, boost::filesystem::path file)
                : _id (id)
-               , _file (file)
-       {}
+       {
+               _content.file = file;
+       }
 
        Font (std::string id, dcp::ArrayData data)
                : _id (id)
-               , _data (data)
-       {}
+       {
+               _content.data = data;
+       }
 
        void as_xml (xmlpp::Node* node);
 
@@ -63,11 +65,11 @@ public:
        }
 
        boost::optional<boost::filesystem::path> file () const {
-               return _file;
+               return _content.file;
        }
 
        void set_file (boost::filesystem::path file) {
-               _file = file;
+               _content.file = file;
                Changed ();
        }
 
@@ -76,6 +78,13 @@ public:
         */
        boost::optional<dcp::ArrayData> data() const;
 
+       /** The actual TTF/OTF font data, as either a filename or the raw data itself */
+       struct Content
+       {
+               boost::optional<dcp::ArrayData> data;
+               boost::optional<boost::filesystem::path> file;
+       };
+
        boost::signals2::signal<void()> Changed;
 
 private:
@@ -83,8 +92,7 @@ private:
         *  font family name or an ID from some DCP font XML.
         */
        std::string _id;
-       boost::optional<dcp::ArrayData> _data;
-       boost::optional<boost::filesystem::path> _file;
+       Content _content;
 };