projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index 0f5a1992c46bad7d9e43d58bf4048a601a0bc0a3..786199e31a681d47db0f3b27cd9efad00de13208 100644
(file)
--- a/
src/lib/subtitle_decoder.cc
+++ b/
src/lib/subtitle_decoder.cc
@@
-19,13
+19,15
@@
#include <boost/shared_ptr.hpp>
#include "subtitle_decoder.h"
#include <boost/shared_ptr.hpp>
#include "subtitle_decoder.h"
+#include "subtitle_content.h"
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::optional;
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::optional;
-SubtitleDecoder::SubtitleDecoder ()
+SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
+ : _subtitle_content (c)
{
}
{
}
@@
-34,9
+36,9
@@
SubtitleDecoder::SubtitleDecoder ()
* Image may be 0 to say that there is no current subtitle.
*/
void
* Image may be 0 to say that there is no current subtitle.
*/
void
-SubtitleDecoder::image_subtitle (ContentTime
from, ContentTime to
, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::image_subtitle (ContentTime
Period period
, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
{
{
- _decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (
from, to
, image, rect)));
+ _decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (
period
, image, rect)));
}
void
}
void
@@
-47,27
+49,29
@@
SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
template <class T>
list<shared_ptr<T> >
template <class T>
list<shared_ptr<T> >
-SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime
from, ContentTime to
)
+SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime
Period period
)
{
{
- if (subs.empty() || from < subs.front()->from() || to > (subs.back()->to() + ContentTime::from_seconds (10))) {
+ if (!has_subtitle_during (period)) {
+ return list<shared_ptr<T> > ();
+ }
+
+ if (subs.empty() || period.from < subs.front()->period().from || period.to > (subs.back()->period().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 */
/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
- seek (from, true);
+ seek (
period.
from, true);
}
/* Now enough pass() calls will either:
* (a) give us what we want, or
* (b) hit the end of the decoder.
}
/* 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()
))) {}
+ while (!pass() && (subs.empty() || (subs.front()->
period().from > period.from || period.to < subs.back()->period().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) {
/* 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
) {
+ if ((*i)->
period().overlaps (period)
) {
out.push_back (*i);
}
}
out.push_back (*i);
}
}
@@
-76,15
+80,15
@@
SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, Conte
}
list<shared_ptr<ContentTextSubtitle> >
}
list<shared_ptr<ContentTextSubtitle> >
-SubtitleDecoder::get_text_subtitles (ContentTime
from, ContentTime to
)
+SubtitleDecoder::get_text_subtitles (ContentTime
Period period
)
{
{
- return get<ContentTextSubtitle> (_decoded_text_subtitles,
from, to
);
+ return get<ContentTextSubtitle> (_decoded_text_subtitles,
period
);
}
list<shared_ptr<ContentImageSubtitle> >
}
list<shared_ptr<ContentImageSubtitle> >
-SubtitleDecoder::get_image_subtitles (ContentTime
from, ContentTime to
)
+SubtitleDecoder::get_image_subtitles (ContentTime
Period period
)
{
{
- return get<ContentImageSubtitle> (_decoded_image_subtitles,
from, to
);
+ return get<ContentImageSubtitle> (_decoded_image_subtitles,
period
);
}
void
}
void