X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=8f56d1975e5e7eb5defa7b529af64af4909fef06;hb=e9cca90a162e3e4b1db4a5e5188831beaa69d44e;hp=175eeacef036eb26b75b34faf7596d1826a2d195;hpb=cef07676fb15c9f1c3c3073d22f06ffe95d9c2ce;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 175eeacef..8f56d1975 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,25 +1,28 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "dcpomatic_time.h"
 #include "rgba.h"
 #include "ffmpeg_stream.h"
+#include <boost/thread/mutex.hpp>
+#include <map>
 
 class FFmpegSubtitleStream : public FFmpegStream
 {
@@ -28,34 +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);
-
-	bool has_image_subtitles () const {
-		return !_image_subtitles.empty ();
-	}
-	bool has_text_subtitles () const {
-		return !_text_subtitles.empty ();
-	}
 	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;
 };