X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.h;h=5eda8764ffeaa91ea5c20758fb46c2cad71e1844;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=c7d1b590d101cbdf5e5acb4c08a822c3c6a0c231;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git diff --git a/src/lib/text_content.h b/src/lib/text_content.h index c7d1b590d..5eda8764f 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -27,7 +27,9 @@ #include #include -class Font; +namespace dcpomatic { + class Font; +} class TextContentProperty { @@ -67,7 +69,7 @@ public: std::string identifier () const; void take_settings_from (boost::shared_ptr c); - void add_font (boost::shared_ptr font); + void add_font (boost::shared_ptr font); void set_use (bool); void set_burn (bool); @@ -122,7 +124,7 @@ public: return _y_scale; } - std::list > fonts () const { + std::list > fonts () const { boost::mutex::scoped_lock lm (_mutex); return _fonts; } @@ -211,7 +213,7 @@ private: double _x_scale; /** y scale factor to apply to subtitles */ double _y_scale; - std::list > _fonts; + std::list > _fonts; boost::optional _colour; boost::optional _effect; boost::optional _effect_colour;