From 41d32a43f761fd2d79dacf9a84374a6d17916d36 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 12 Jun 2014 23:34:31 +0100
Subject: Fix subrip subtitles a little.

---
 src/lib/subtitle_decoder.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/subtitle_decoder.cc')

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 13cf481c8..fc03442d5 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -51,7 +51,8 @@ template <class T>
 list<shared_ptr<T> >
 SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod period)
 {
-	if (!_subtitle_content->has_subtitle_during (period)) {
+	if (!has_subtitle_during (period)) {
+		cout << "no subtitle during this period.\n";
 		return list<shared_ptr<T> > ();
 	}
 
@@ -71,7 +72,7 @@ SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod perio
 	
 	list<shared_ptr<T> > out;
 	for (typename list<shared_ptr<T> >::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-		if ((*i)->period().from <= period.to && (*i)->period().to >= period.from) {
+		if ((*i)->period().overlaps (period)) {
 			out.push_back (*i);
 		}
 	}
-- 
cgit v1.2.3