Fix merging of audio in various circumstances.

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

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index c03004b3259d374cc0beebf3132f056e503155d1..704ac7b79cb5f44b6dc54ab8efbde420c4ee41d0 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -21,6 +21,7 @@
 #include "dcpomatic_time.h"
 #include "rgba.h"
 #include "ffmpeg_stream.h"
+#include <map>
 
 class FFmpegSubtitleStream : public FFmpegStream
 {
@@ -35,19 +36,21 @@ public:
 
        void add_image_subtitle (std::string id, ContentTimePeriod period);
        void add_text_subtitle (std::string id, ContentTimePeriod period);
-       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const;
-       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const;
+       void set_subtitle_to (std::string id, ContentTime to);
        ContentTime find_subtitle_to (std::string id) const;
+       bool unknown_to (std::string id) const;
        void add_offset (ContentTime offset);
        void set_colour (RGBA from, RGBA to);
        std::map<RGBA, RGBA> colours () const;
 
+       bool has_text () const;
+       bool has_image () const;
+
 private:
 
        typedef std::map<std::string, ContentTimePeriod> PeriodMap;
 
        void as_xml (xmlpp::Node *, PeriodMap const & subs, std::string node) const;
-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const;
 
        PeriodMap _image_subtitles;
        PeriodMap _text_subtitles;