#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
-#include <dcp/interop_subtitle_content.h>
+#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
using std::list;
using std::cout;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
- shared_ptr<dcp::SubtitleContent> c (load (content->path (0)));
+ shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
}
_next = _subtitles.begin ();
list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
- while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().to_seconds()) < time) {
+ while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().as_seconds()) < time) {
++i;
}
}
bool
-DCPSubtitleDecoder::pass (PassReason)
+DCPSubtitleDecoder::pass (PassReason, bool)
{
if (_next == _subtitles.end ()) {
return true;
}
+ /* Gather all subtitles with the same time period that are next
+ on the list. We must emit all subtitles for the same time
+ period with the same text_subtitle() call otherwise the
+ SubtitleDecoder will assume there is nothing else at the
+ time of emit the first.
+ */
+
list<dcp::SubtitleString> s;
- s.push_back (*_next);
- text_subtitle (s);
- ++_next;
+ ContentTimePeriod const p = content_time_period (*_next);
+
+ while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+ s.push_back (*_next);
+ ++_next;
+ }
+
+ text_subtitle (p, s);
return false;
}
{
return list<ContentTimePeriod> ();
}
-
+
list<ContentTimePeriod>
DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
{
list<ContentTimePeriod> d;
for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- ContentTimePeriod period (
- ContentTime::from_seconds (i->in().to_seconds ()),
- ContentTime::from_seconds (i->out().to_seconds ())
- );
-
+ ContentTimePeriod period = content_time_period (*i);
if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
d.push_back (period);
}
return d;
}
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
+{
+ return ContentTimePeriod (
+ ContentTime::from_seconds (s.in().as_seconds ()),
+ ContentTime::from_seconds (s.out().as_seconds ())
+ );
+}