projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c51e343
)
Fix dying butler on changing CPL from one without to one with
v2.14.13
author
Carl Hetherington
<cth@carlh.net>
Wed, 30 Oct 2019 21:39:58 +0000
(21:39 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 30 Oct 2019 21:39:58 +0000
(21:39 +0000)
subtitles (#1641).
src/lib/dcp_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index 8179ef0096b7c1e4bd8a7852af36119c3cacb28d..340ef5d93352a882d6f43f50c70ad2dbec1215e1 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-204,8
+204,14
@@
void
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
{
list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
{
list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+ if (decoder == text.end()) {
+ /* It's possible that there is now a main subtitle but no TextDecoders, for example if
+ the CPL has just changed but the TextContent's texts have not been recreated yet.
+ */
+ return;
+ }
+
if ((*_reel)->main_subtitle()) {
if ((*_reel)->main_subtitle()) {
- DCPOMATIC_ASSERT (decoder != text.end ());
pass_texts (
next,
(*_reel)->main_subtitle()->asset(),
pass_texts (
next,
(*_reel)->main_subtitle()->asset(),
@@
-216,8
+222,8
@@
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
);
++decoder;
}
);
++decoder;
}
+
BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
- DCPOMATIC_ASSERT (decoder != text.end ());
pass_texts (
next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size
);
pass_texts (
next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size
);