diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-08 23:41:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-10 23:43:55 +0100 |
| commit | c4403784febdbdd42e9c32e67fadb147f11fe566 (patch) | |
| tree | a3c76832e341eedcaed2152c2ebf4dd76325b6b2 /src/lib/text_content.h | |
| parent | 248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff) | |
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/text_content.h')
| -rw-r--r-- | src/lib/text_content.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/text_content.h b/src/lib/text_content.h index 83860dff5..c7d1b590d 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -83,9 +83,9 @@ public: void set_effect_colour (dcp::Colour); void unset_effect_colour (); void set_line_spacing (double s); - void set_fade_in (ContentTime); + void set_fade_in (dcpomatic::ContentTime); void unset_fade_in (); - void set_fade_out (ContentTime); + void set_fade_out (dcpomatic::ContentTime); void set_outline_width (int); void unset_fade_out (); void set_type (TextType type); @@ -152,12 +152,12 @@ public: return _line_spacing; } - boost::optional<ContentTime> fade_in () const { + boost::optional<dcpomatic::ContentTime> fade_in () const { boost::mutex::scoped_lock lm (_mutex); return _fade_in; } - boost::optional<ContentTime> fade_out () const { + boost::optional<dcpomatic::ContentTime> fade_out () const { boost::mutex::scoped_lock lm (_mutex); return _fade_out; } @@ -217,8 +217,8 @@ private: boost::optional<dcp::Colour> _effect_colour; /** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */ double _line_spacing; - boost::optional<ContentTime> _fade_in; - boost::optional<ContentTime> _fade_out; + boost::optional<dcpomatic::ContentTime> _fade_in; + boost::optional<dcpomatic::ContentTime> _fade_out; int _outline_width; /** what these captions will be used for in the output DCP (not necessarily what * they were originally). |