X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fhints.cc;h=df29a333699de0cabee2f9588e1ac38aaae3148a;hp=c1d90abcd89b73dcb92ad7bdf9289ebb298595e0;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=0842dd61d076e78b600dc9ce37d3d66af7f45d95 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 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;