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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 7ad9c458c..daafee3e5 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -27,12 +28,13 @@ using std::cout;
 using boost::shared_ptr;
 using boost::bind;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> 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)
 			)
@@ -78,6 +80,7 @@ DCPSubtitleDecoder::pass (PassReason, bool)
 	}
 
 	subtitle->give_text (p, s);
+	subtitle->set_position (p.from);
 
 	return false;
 }
@@ -97,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;
 }