projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Film pointer into Decoder.
[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 965f9db61dc20d9719b16a2a0a2d8ecdc027fa0d..6c95b8b1fa4aadcc99396e51d3e09102d7739104 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.cc
+++ b/
src/lib/dcp_subtitle_decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-26,9
+26,11
@@
using std::list;
using std::cout;
using boost::shared_ptr;
using std::list;
using std::cout;
using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
using boost::bind;
using boost::bind;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+ : Decoder (film)
{
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
_subtitles = c->subtitles ();
{
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
_subtitles = c->subtitles ();
@@
-38,7
+40,7
@@
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
if (_next != _subtitles.end()) {
first = content_time_period(*_next).from;
}
if (_next != _subtitles.end()) {
first = content_time_period(*_next).from;
}
-
subtitle.reset (new SubtitleDecoder (this, content->subtitle, log, first
));
+
text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)
));
}
void
}
void
@@
-47,8
+49,8
@@
DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
Decoder::seek (time, accurate);
_next = _subtitles.begin ();
Decoder::seek (time, accurate);
_next = _subtitles.begin ();
- list<
dcp::SubtitleString
>::const_iterator i = _subtitles.begin ();
- while (i != _subtitles.end() && ContentTime::from_seconds (
_next
->in().as_seconds()) < time) {
+ list<
shared_ptr<dcp::Subtitle>
>::const_iterator i = _subtitles.begin ();
+ while (i != _subtitles.end() && ContentTime::from_seconds (
(*_next)
->in().as_seconds()) < time) {
++i;
}
}
++i;
}
}
@@
-62,8
+64,8
@@
DCPSubtitleDecoder::pass ()
/* Gather all subtitles with the same time period that are next
on the list. We must emit all subtitles for the same time
/* 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
-
Subtitle
Decoder will assume there is nothing else at the
+ period with the same
plain_text
() call otherwise the
+
Text
Decoder will assume there is nothing else at the
time of emit the first.
*/
time of emit the first.
*/
@@
-71,19
+73,24
@@
DCPSubtitleDecoder::pass ()
ContentTimePeriod const p = content_time_period (*_next);
while (_next != _subtitles.end () && content_time_period (*_next) == p) {
ContentTimePeriod const p = content_time_period (*_next);
while (_next != _subtitles.end () && content_time_period (*_next) == p) {
- s.push_back (*_next);
- ++_next;
+ shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+ if (ns) {
+ s.push_back (*ns);
+ ++_next;
+ }
+
+ /* XXX: image subtitles */
}
}
-
subtitle->emit_text
(p, s);
+
only_text()->emit_plain
(p, s);
return false;
}
ContentTimePeriod
return false;
}
ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (
dcp::SubtitleString
s) const
+DCPSubtitleDecoder::content_time_period (
shared_ptr<dcp::Subtitle>
s) const
{
return ContentTimePeriod (
{
return ContentTimePeriod (
- ContentTime::from_seconds (s
.
in().as_seconds ()),
- ContentTime::from_seconds (s
.
out().as_seconds ())
+ ContentTime::from_seconds (s
->
in().as_seconds ()),
+ ContentTime::from_seconds (s
->
out().as_seconds ())
);
}
);
}