diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-08 23:56:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-10 23:43:55 +0100 |
| commit | f41818f14369f170475b7f2bde1a2dd856517b14 (patch) | |
| tree | 2fd7d07fb63e46e8ad2964917cff5704d1893f85 /src/lib/text_content.h | |
| parent | c4403784febdbdd42e9c32e67fadb147f11fe566 (diff) | |
Put Font and Screen into dcpomatic namespace.
Diffstat (limited to 'src/lib/text_content.h')
| -rw-r--r-- | src/lib/text_content.h | 12 |
1 files changed, 7 insertions, 5 deletions
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 <cth@carlh.net> + Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -27,7 +27,9 @@ #include <dcp/types.h> #include <boost/signals2.hpp> -class Font; +namespace dcpomatic { + class Font; +} class TextContentProperty { @@ -67,7 +69,7 @@ public: std::string identifier () const; void take_settings_from (boost::shared_ptr<const TextContent> c); - void add_font (boost::shared_ptr<Font> font); + void add_font (boost::shared_ptr<dcpomatic::Font> font); void set_use (bool); void set_burn (bool); @@ -122,7 +124,7 @@ public: return _y_scale; } - std::list<boost::shared_ptr<Font> > fonts () const { + std::list<boost::shared_ptr<dcpomatic::Font> > 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<boost::shared_ptr<Font> > _fonts; + std::list<boost::shared_ptr<dcpomatic::Font> > _fonts; boost::optional<dcp::Colour> _colour; boost::optional<dcp::Effect> _effect; boost::optional<dcp::Colour> _effect_colour; |