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_decoder.h | |
| parent | 248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff) | |
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/text_decoder.h')
| -rw-r--r-- | src/lib/text_decoder.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index a82f43f51..02afeeb94 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -41,20 +41,20 @@ public: TextDecoder ( Decoder* parent, boost::shared_ptr<const TextContent>, - ContentTime first + dcpomatic::ContentTime first ); - ContentTime position (boost::shared_ptr<const Film>) const { + dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const { return _position; } - void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); - void emit_bitmap (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); - void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s); - void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle); - void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s); - void emit_plain (ContentTimePeriod period, sub::Subtitle const & subtitle); - void emit_stop (ContentTime to); + void emit_bitmap_start (dcpomatic::ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); + void emit_bitmap (dcpomatic::ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); + void emit_plain_start (dcpomatic::ContentTime from, std::list<dcp::SubtitleString> s); + void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle); + void emit_plain (dcpomatic::ContentTimePeriod period, std::list<dcp::SubtitleString> s); + void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle); + void emit_stop (dcpomatic::ContentTime to); void seek (); @@ -64,11 +64,11 @@ public: boost::signals2::signal<void (ContentBitmapText)> BitmapStart; boost::signals2::signal<void (ContentStringText)> PlainStart; - boost::signals2::signal<void (ContentTime)> Stop; + boost::signals2::signal<void (dcpomatic::ContentTime)> Stop; private: boost::shared_ptr<const TextContent> _content; - ContentTime _position; + dcpomatic::ContentTime _position; }; #endif |