Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index e2bd9c9d6ee6575ed5a56849eccc83ca6a09bd2d..317755107abaca3b6445c972ea56ae68c84aa6b2 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,25 +20,51 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <boost/signals2.hpp>
-#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
-#include "decoded.h"
+#include "content_subtitle.h"
+#include <dcp/subtitle_string.h>
 
-class Film;
-class DCPTimedSubtitle;
 class Image;
 
-class SubtitleDecoder : public virtual Decoder
+class SubtitleDecoder
 {
 public:
-       SubtitleDecoder (boost::shared_ptr<const Film>);
+       /** 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::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> image_subtitles_during,
+               boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> text_subtitles_during
+               );
+
+       std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting, bool accurate);
+       std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting, bool accurate);
+
+       void seek (ContentTime, bool);
+
+       void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+       void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+
+       boost::shared_ptr<const SubtitleContent> content () const {
+               return _subtitle_content;
+       }
+
+private:
+       Decoder* _parent;
+       std::list<ContentImageSubtitle> _decoded_image_subtitles;
+       std::list<ContentTextSubtitle> _decoded_text_subtitles;
+       boost::shared_ptr<const SubtitleContent> _subtitle_content;
+
+       template <class T>
+       std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate);
 
-protected:
-       void image_subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
-       void text_subtitle (std::list<dcp::SubtitleString>);
+       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _image_subtitles_during;
+       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _text_subtitles_during;
 };
 
 #endif