From de2af791bdfdcd653752cba970e59efc7bf810c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Nov 2016 16:57:15 +0000 Subject: Basic grunt-work, untested and unfinished, but it compiles. --- src/lib/ffmpeg_subtitle_stream.cc | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'src/lib/ffmpeg_subtitle_stream.cc') 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 -FFmpegSubtitleStream::image_subtitles_during (ContentTimePeriod period, bool starting) const -{ - return subtitles_during (period, starting, _image_subtitles); -} - -list -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 -FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const -{ - list d; - - /* XXX: inefficient */ - for (map::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 { -- cgit v1.2.3