X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=8f56d1975e5e7eb5defa7b529af64af4909fef06;hp=c03004b3259d374cc0beebf3132f056e503155d1;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index c03004b32..8f56d1975 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-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,8 @@
 #include "dcpomatic_time.h"
 #include "rgba.h"
 #include "ffmpeg_stream.h"
+#include <boost/thread/mutex.hpp>
+#include <map>
 
 class FFmpegSubtitleStream : public FFmpegStream
 {
@@ -29,27 +31,15 @@ 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;
 
 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;
+	/** mutex to protect _colours as it can be set from the "examine FFmpeg subtitles" job thread */
+	mutable boost::mutex _mutex;
 	std::map<RGBA, RGBA> _colours;
 };