projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing subtitles in some cases.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_decoder.cc
diff --git
a/src/lib/dcp_subtitle_decoder.cc
b/src/lib/dcp_subtitle_decoder.cc
index 20a9f32fee031ddd99fc03f19ab1d5182614e6f7..bb2537fc4181368e4ca53390513f18941a9f58e0 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.cc
+++ b/
src/lib/dcp_subtitle_decoder.cc
@@
-17,9
+17,9
@@
*/
*/
-#include <dcp/subtitle_content.h>
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
using std::list;
using std::cout;
using std::list;
using std::cout;
@@
-28,8
+28,8
@@
using boost::shared_ptr;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
-
dcp::SubtitleContent c (content->path (0), false
);
- _subtitles = c
.
subtitles ();
+
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0))
);
+ _subtitles = c
->
subtitles ();
_next = _subtitles.begin ();
}
_next = _subtitles.begin ();
}
@@
-40,7
+40,7
@@
DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
_next = _subtitles.begin ();
list<dcp::SubtitleString>::const_iterator i = _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;
}
}
++i;
}
}
@@
-54,25
+54,27
@@
DCPSubtitleDecoder::pass ()
list<dcp::SubtitleString> s;
s.push_back (*_next);
list<dcp::SubtitleString> s;
s.push_back (*_next);
- text_subtitle (s);
+ text_subtitle (
content_time_period (*_next),
s);
++_next;
return false;
}
list<ContentTimePeriod>
++_next;
return false;
}
list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+ return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
{
/* XXX: inefficient */
list<ContentTimePeriod> d;
for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
{
/* XXX: inefficient */
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);
}
if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
d.push_back (period);
}
@@
-81,3
+83,11
@@
DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
return d;
}
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 ())
+ );
+}