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/content_text.h | |
| parent | 248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff) | |
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/content_text.h')
| -rw-r--r-- | src/lib/content_text.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/content_text.h b/src/lib/content_text.h index 2d8910577..0c0df1ee6 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -33,22 +33,22 @@ class Image; class ContentText { public: - explicit ContentText (ContentTime f) + explicit ContentText (dcpomatic::ContentTime f) : _from (f) {} - ContentTime from () const { + dcpomatic::ContentTime from () const { return _from; } private: - ContentTime _from; + dcpomatic::ContentTime _from; }; class ContentBitmapText : public ContentText { public: - ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r) + ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r) : ContentText (f) , sub (im, r) {} @@ -64,7 +64,7 @@ public: class ContentStringText : public ContentText { public: - ContentStringText (ContentTime f, std::list<dcp::SubtitleString> s) + ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s) : ContentText (f) , subs (s) {} |
