CCAP doc tweaks.

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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index e5e9316693514e33fead9841e544ffed28e2432c..c1f171b1fbb799ebe0a128ff606b1932df5f0e68 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.
 
@@ -27,6 +27,7 @@
 #include "content_subtitle.h"
 #include "decoder_part.h"
 #include <dcp/subtitle_string.h>
+#include <boost/signals2.hpp>
 
 namespace sub {
        class Subtitle;
@@ -37,53 +38,37 @@ class Image;
 class SubtitleDecoder : public DecoderPart
 {
 public:
-       /** Second parameter to the _during functions is true if we
-        *  want only subtitles that start during the period,
-        *  otherwise we want subtitles that overlap the period.
-        */
        SubtitleDecoder (
                Decoder* parent,
                boost::shared_ptr<const SubtitleContent>,
                boost::shared_ptr<Log> log,
-               boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> image_during,
-               boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+               ContentTime first
                );
 
-       std::list<ContentImageSubtitle> get_image (ContentTimePeriod period, bool starting, bool accurate);
-       std::list<ContentTextSubtitle> get_text (ContentTimePeriod period, bool starting, bool accurate);
+       ContentTime position () const {
+               return _position;
+       }
 
-       void seek (ContentTime, bool);
-       void reset ();
+       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);
 
-       void give_image (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-       void give_text (ContentTimePeriod period, std::list<dcp::SubtitleString>);
-       void give_text (ContentTimePeriod period, sub::Subtitle const & subtitle);
+       void seek ();
 
        boost::shared_ptr<const SubtitleContent> content () const {
                return _content;
        }
 
-       boost::optional<ContentTime> position () const {
-               return _position;
-       }
-
-       void reset_position () {
-               _position.reset ();
-       }
+       boost::signals2::signal<void (ContentImageSubtitle)> ImageStart;
+       boost::signals2::signal<void (ContentTextSubtitle)> TextStart;
+       boost::signals2::signal<void (ContentTime)> Stop;
 
 private:
-
-       std::list<ContentImageSubtitle> _decoded_image;
-       std::list<ContentTextSubtitle> _decoded_text;
        boost::shared_ptr<const SubtitleContent> _content;
-
-       template <class T>
-       std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool accurate);
-
-       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _image_during;
-       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _text_during;
-
-       boost::optional<ContentTime> _position;
+       ContentTime _position;
 };
 
 #endif