From 861117816d557cd048d56b26f8903ac26a94b395 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Dec 2014 22:44:23 +0000 Subject: Switch subtitle string font specs to be the font ID; split SubtitleContent into Interop and SMPTE. --- src/subtitle_string.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/subtitle_string.h') diff --git a/src/subtitle_string.h b/src/subtitle_string.h index b313e82b..512a1b5b 100644 --- a/src/subtitle_string.h +++ b/src/subtitle_string.h @@ -26,6 +26,7 @@ #include "types.h" #include "dcp_time.h" +#include #include namespace dcp { @@ -37,7 +38,7 @@ class SubtitleString { public: SubtitleString ( - std::string font, + boost::optional font, bool italic, Color color, int size, @@ -52,8 +53,8 @@ public: Time fade_down_time ); - /** @return font name */ - std::string font () const { + /** @return font ID */ + boost::optional font () const { return _font; } @@ -122,8 +123,8 @@ public: } private: - /** font name */ - std::string _font; + /** font ID */ + boost::optional _font; /** true if the text is italic */ bool _italic; /** text colour */ -- cgit v1.2.3