Initial work on removing storage of subtitle times.

[dcpomatic.git] / src / lib / subtitle_decoder.h

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 6d0479638c6462a34ffbba190d3c9607b4b36743..92a6266de4b96d19534a5a70e1eea7a15cc7117f 100644 (file)
--- 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;