X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=ce4faa0e42afb7c3b52a0ddfd8cf7fa4c3258932;hb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;hp=b16b825e7d76b3a401bc36c94a28b382771b1cd8;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index b16b825e7..ce4faa0e4 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 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
@@ -18,6 +18,7 @@
 */
 
 #include "dcpomatic_time.h"
+#include "rgba.h"
 #include "ffmpeg_stream.h"
 
 class FFmpegSubtitleStream : public FFmpegStream
@@ -26,11 +27,28 @@ public:
 	FFmpegSubtitleStream (std::string n, int i)
 		: FFmpegStream (n, i)
 	{}
-	
-	FFmpegSubtitleStream (cxml::ConstNodePtr);
+
+	FFmpegSubtitleStream (cxml::ConstNodePtr, int version);
 
 	void as_xml (xmlpp::Node *) const;
 
-	std::vector<ContentTimePeriod> periods;
-};
+	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;
+	ContentTime find_subtitle_to (std::string id) const;
+	void add_offset (ContentTime offset);
+	void set_colour (RGBA from, RGBA to);
+	std::map<RGBA, RGBA> colours () 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;
+	std::map<RGBA, RGBA> _colours;
+};