X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=8f56d1975e5e7eb5defa7b529af64af4909fef06;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=3ed931b8c996b1691cf0acbe25dc9434d28b1cd1;hpb=83e5567530d0be24490abdda46d196e4279c5030;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 3ed931b8c..8f56d1975 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,24 +1,28 @@
 /*
-    Copyright (C) 2013-2015 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
 {
@@ -26,16 +30,16 @@ public:
 	FFmpegSubtitleStream (std::string n, int i)
 		: FFmpegStream (n, i)
 	{}
-	
-	FFmpegSubtitleStream (cxml::ConstNodePtr);
+
+	FFmpegSubtitleStream (cxml::ConstNodePtr node, int version);
 
 	void as_xml (xmlpp::Node *) const;
 
-	void add_subtitle (ContentTimePeriod period);
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const;
-	ContentTime find_subtitle_to (ContentTime from) const;
+	void set_colour (RGBA from, RGBA to);
+	std::map<RGBA, RGBA> colours () const;
 
 private:
-	std::map<ContentTime, ContentTime> _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;
 };
-