/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "subtitle_decoder.h"
using std::list;
+using std::cout;
using boost::shared_ptr;
using boost::optional;
template <class T>
list<shared_ptr<T> >
-get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
+SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
{
+ if (subs.empty() || from < subs.front()->from() || to > (subs.back()->to() + ContentTime::from_seconds (10))) {
+ /* Either we have no decoded data, or what we do have is a long way from what we want: seek */
+ seek (from, true);
+ }
+
+ /* Now enough pass() calls will either:
+ * (a) give us what we want, or
+ * (b) hit the end of the decoder.
+ *
+ * XXX: with subs being sparse, this may need more care...
+ */
+ while (!pass() && (subs.empty() || (subs.front()->from() > from || to < subs.back()->to()))) {}
+
+ /* Now look for what we wanted in the data we have collected */
/* XXX: inefficient */
+
list<shared_ptr<T> > out;
for (typename list<shared_ptr<T> >::const_iterator i = subs.begin(); i != subs.end(); ++i) {
if ((*i)->from() <= to && (*i)->to() >= from) {
{
return get<ContentImageSubtitle> (_decoded_image_subtitles, from, to);
}
+
+void
+SubtitleDecoder::seek (ContentTime, bool)
+{
+ _decoded_text_subtitles.clear ();
+ _decoded_image_subtitles.clear ();
+}