X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=daafee3e5acfaf687a6d4b5de76f064dfeede0df;hb=878e19aabf2278828a3c9b518e0804b2cef0c01e;hp=1c6b973d683913722e4b6cecb2570bed205b0f21;hpb=526fd6de4c80a7ac9614a1cb0209efff7b171cd5;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 1c6b973d6..daafee3e5 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 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/>.
 
 */
 
@@ -25,10 +26,20 @@
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::bind;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
-	: SubtitleDecoder (content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
 {
+	subtitle.reset (
+		new SubtitleDecoder (
+			this,
+			content->subtitle,
+			log,
+			bind (&DCPSubtitleDecoder::image_subtitles_during, this, _1, _2),
+			bind (&DCPSubtitleDecoder::text_subtitles_during, this, _1, _2)
+			)
+		);
+
 	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
 	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
@@ -37,7 +48,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-	SubtitleDecoder::seek (time, accurate);
+	subtitle->seek (time, accurate);
 
 	_next = _subtitles.begin ();
 	list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
@@ -47,7 +58,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-DCPSubtitleDecoder::pass ()
+DCPSubtitleDecoder::pass (PassReason, bool)
 {
 	if (_next == _subtitles.end ()) {
 		return true;
@@ -68,7 +79,8 @@ DCPSubtitleDecoder::pass ()
 		++_next;
 	}
 
-	text_subtitle (p, s);
+	subtitle->give_text (p, s);
+	subtitle->set_position (p.from);
 
 	return false;
 }
@@ -88,11 +100,14 @@ DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) c
 
 	for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
 		ContentTimePeriod period = content_time_period (*i);
-		if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
+		if ((starting && p.contains(period.from)) || (!starting && p.overlap(period))) {
 			d.push_back (period);
 		}
 	}
 
+	d.sort ();
+	d.unique ();
+
 	return d;
 }