X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_text.h;h=0c0df1ee63bdce15f3c5d9905af302c31a10c43d;hb=bd83f1b0e1d8e7aae0af51376dbbb88d5e3f69d0;hp=2d8910577926c38bd259b1e10a7a7c82c90f356d;hpb=7962e6cfd5fbd97e1e44aebe3fc190c62da027e9;p=dcpomatic.git 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 im, dcpomatic::Rect r) + ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr im, dcpomatic::Rect r) : ContentText (f) , sub (im, r) {} @@ -64,7 +64,7 @@ public: class ContentStringText : public ContentText { public: - ContentStringText (ContentTime f, std::list s) + ContentStringText (dcpomatic::ContentTime f, std::list s) : ContentText (f) , subs (s) {}