Rename some methods.

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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 142cfa42b766b0813fb1570d530268d886beee2c..3b101526ab9f045d792c13e90f951d072741bbe6 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,40 +20,51 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.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 SubtitleContent>);
+       /** 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_during,
+               boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+               );
 
-       std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting);
-       std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting);
+       std::list<ContentImageSubtitle> get_image (ContentTimePeriod period, bool starting, bool accurate);
+       std::list<ContentTextSubtitle> get_text (ContentTimePeriod period, bool starting, bool accurate);
 
-protected:
        void seek (ContentTime, bool);
-       
-       void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-       void text_subtitle (std::list<dcp::SubtitleString>);
 
-       std::list<ContentImageSubtitle> _decoded_image_subtitles;
-       std::list<ContentTextSubtitle> _decoded_text_subtitles;
+       void give_image (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+       void give_text (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+
+       boost::shared_ptr<const SubtitleContent> content () const {
+               return _content;
+       }
 
 private:
+       Decoder* _parent;
+       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, ContentTimePeriod period, bool starting);
+       std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate);
 
-       virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const = 0;
-       
-       boost::shared_ptr<const SubtitleContent> _subtitle_content;
+       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _image_during;
+       boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _text_during;
 };
 
 #endif