diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-29 00:41:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-29 00:41:48 +0000 |
| commit | 3271345e7b35c6fdbe85cb3a14337d10973370be (patch) | |
| tree | 12b5ce6d99843b48b8687522517db64d6c110bea | |
| parent | 1d9bbf7bb0b52d5461719d2d3fe5ea178565e35d (diff) | |
Don't warn about overlapping CCAPs in SMPTE DCPs (part of #1516).
| -rw-r--r-- | src/lib/hints.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/hints.cc b/src/lib/hints.cc index c1d90abcd..df29a3336 100644 --- 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; } - 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; - 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; |
