X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=064c72f8d6166b1beef064cf16d39bd21fb82e8e;hb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;hp=6d4853b8d2a4a83f5bd206158504e731f2f57c78;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 6d4853b8d..064c72f8d 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -30,30 +30,13 @@ public:
 		: FFmpegStream (n, i)
 	{}
 
-	FFmpegSubtitleStream (cxml::ConstNodePtr, int version);
+	FFmpegSubtitleStream (cxml::ConstNodePtr node, int version);
 
 	void as_xml (xmlpp::Node *) const;
 
-	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;
 
-	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;
 	std::map<RGBA, RGBA> _colours;
 };