*/
#include "ffmpeg_subtitle_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <iostream>
using std::list;
using std::cout;
using std::make_pair;
+using dcp::raw_convert;
/** Construct a SubtitleStream from a value returned from to_string().
* @param t String returned from to_string().
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
{
/* XXX: inefficient */
for (map<string, ContentTimePeriod>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
- if ((starting && period.contains (i->second.from)) || (!starting && period.overlaps (i->second))) {
+ if ((starting && period.contains(i->second.from)) || (!starting && period.overlap(i->second))) {
d.push_back (i->second);
}
}
+ d.sort (PeriodSorter ());
+
return d;
}