X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.cc;h=62accfaf871426aa751fb77dd3576adfd072559c;hp=d389714e9e0c5ef9f194432e88bc34dfd08e2a82;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hpb=06152300e69e8faca44ff8d7f12a6fd354848b9a

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index d389714e9..62accfaf8 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -132,42 +132,6 @@ FFmpegSubtitleStream::add_text_subtitle (string id, ContentTimePeriod period)
 	_text_subtitles[id] = period;
 }
 
-list<ContentTimePeriod>
-FFmpegSubtitleStream::image_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-	return subtitles_during (period, starting, _image_subtitles);
-}
-
-list<ContentTimePeriod>
-FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-	return subtitles_during (period, starting, _text_subtitles);
-}
-
-struct PeriodSorter
-{
-	bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) {
-		return a.from < b.from;
-	}
-};
-
-list<ContentTimePeriod>
-FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const
-{
-	list<ContentTimePeriod> d;
-
-	/* XXX: inefficient */
-	for (map<string, ContentTimePeriod>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-		if ((starting && period.contains(i->second.from)) || (!starting && period.overlap(i->second))) {
-			d.push_back (i->second);
-		}
-	}
-
-	d.sort (PeriodSorter ());
-
-	return d;
-}
-
 ContentTime
 FFmpegSubtitleStream::find_subtitle_to (string id) const
 {