diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-26 15:29:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-27 10:55:07 +0100 |
| commit | ba8a5a15cc27988e2bbc6acd470d8532f1d8e99f (patch) | |
| tree | 375bd068bbd86760f85fcd1264c1d8d76f2f1240 /src/lib/subtitle_decoder.h | |
| parent | f5a2789fcab274f2beda4a1e4ff59567158c9686 (diff) | |
Initial work on removing storage of subtitle times.
Diffstat (limited to 'src/lib/subtitle_decoder.h')
| -rw-r--r-- | src/lib/subtitle_decoder.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h index 6d0479638..92a6266de 100644 --- a/src/lib/subtitle_decoder.h +++ b/src/lib/subtitle_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -52,16 +52,20 @@ public: return _position; } - void emit_image (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); + void emit_image_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); + void emit_text_start (ContentTime from, std::list<dcp::SubtitleString> s); + void emit_text_start (ContentTime from, sub::Subtitle const & subtitle); void emit_text (ContentTimePeriod period, std::list<dcp::SubtitleString> s); void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle); + void emit_stop (ContentTime to); boost::shared_ptr<const SubtitleContent> content () const { return _content; } - boost::signals2::signal<void (ContentImageSubtitle)> ImageData; - boost::signals2::signal<void (ContentTextSubtitle)> TextData; + boost::signals2::signal<void (ContentImageSubtitle)> ImageStart; + boost::signals2::signal<void (ContentTextSubtitle)> TextStart; + boost::signals2::signal<void (ContentTime)> Stop; private: boost::shared_ptr<const SubtitleContent> _content; |
