projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give DCPDecoder its own ::position which just returns its internal
[dcpomatic.git]
/
src
/
lib
/
hints.cc
diff --git
a/src/lib/hints.cc
b/src/lib/hints.cc
index c1d90abcd89b73dcb92ad7bdf9289ebb298595e0..df29a333699de0cabee2f9588e1ac38aaae3148a 100644
(file)
--- a/
src/lib/hints.cc
+++ b/
src/lib/hints.cc
@@
-320,9
+320,13
@@
Hints::text (PlayerText text, TextType type, DCPTimePeriod period)
_too_many_ccap_lines = true;
}
_too_many_ccap_lines = true;
}
- if (!_overlap_ccap && _last && _last->overlap(period)) {
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+
+ /* XXX: maybe overlapping closed captions (i.e. different languages) are OK with Interop? */
+ if (film->interop() && !_overlap_ccap && _last && _last->overlap(period)) {
_overlap_ccap = true;
_overlap_ccap = true;
- hint (_("You have overlapping closed captions, which are not allowed."));
+ hint (_("You have overlapping closed captions, which are not allowed
in Interop DCPs. Change your DCP standard to SMPTE
."));
}
_last = period;
}
_last = period;