Rearrange subtitle font management.

[dcpomatic.git] / src / lib / font.cc

diff --git a/src/lib/font.cc b/src/lib/font.cc
index f750bfc88401b4a69939ea993aecf6ed35b97a0a..375427d93f71d57897da277f392b668dfce4f6d9 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -28,6 +28,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
+using boost::optional;
 using namespace dcpomatic;
 
 
@@ -69,3 +70,19 @@ dcpomatic::operator!= (Font const & a, Font const & b)
 {
        return !(a == b);
 }
+
+
+optional<dcp::ArrayData>
+Font::data () const
+{
+       if (_data) {
+               return _data;
+       }
+
+       if (_file) {
+               return dcp::ArrayData(*_file);
+       }
+
+       return {};
+}
+