projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of multiple captions per content so that DCPContent can
[dcpomatic.git]
/
src
/
lib
/
text_caption_file_decoder.cc
diff --git
a/src/lib/text_caption_file_decoder.cc
b/src/lib/text_caption_file_decoder.cc
index 46217e49b550b2a4421afab0febc21449081e945..65de6a562a114255b5b17bb50d4ffce534da24e2 100644
(file)
--- a/
src/lib/text_caption_file_decoder.cc
+++ b/
src/lib/text_caption_file_decoder.cc
@@
-43,7
+43,7
@@
TextCaptionFileDecoder::TextCaptionFileDecoder (shared_ptr<const TextCaptionFile
if (!_subtitles.empty()) {
first = content_time_period(_subtitles[0]).from;
}
if (!_subtitles.empty()) {
first = content_time_period(_subtitles[0]).from;
}
- caption.
reset (new CaptionDecoder (this, content->caption, log, first
));
+ caption.
push_back (shared_ptr<CaptionDecoder> (new CaptionDecoder (this, content->only_caption(), log, first)
));
}
void
}
void
@@
-73,7
+73,7
@@
TextCaptionFileDecoder::pass ()
}
ContentTimePeriod const p = content_time_period (_subtitles[_next]);
}
ContentTimePeriod const p = content_time_period (_subtitles[_next]);
-
caption
->emit_plain (p, _subtitles[_next]);
+
only_caption()
->emit_plain (p, _subtitles[_next]);
++_next;
return false;
++_next;
return false;