Fix missing subtitles in some cases.

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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index d7faaa0145900658edb2441597a47b0d5e3af968..5f11e27e7157a3c607175d994fbefdb63ea8f83e 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -40,22 +40,23 @@ public:
 
 protected:
        void seek (ContentTime, bool);
-       
+
        void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-       void text_subtitle (std::list<dcp::SubtitleString>);
+       void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
 
        std::list<ContentImageSubtitle> _decoded_image_subtitles;
        std::list<ContentTextSubtitle> _decoded_text_subtitles;
 
 private:
        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);
 
        /** @param starting true if we want only subtitles that start during the period, otherwise
         *  we want subtitles that overlap the period.
         */
-       virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const = 0;
-       
+       virtual std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+       virtual std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+
        boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };