diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-25 11:07:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-04-25 11:07:09 +0100 |
| commit | d4bdbb21755b52094988ade47fb51a5698def744 (patch) | |
| tree | 0956e808ccacf6e0fa0889f41888d5c234cdd090 /src | |
| parent | 77a45649624c2239bca96b9a8346461ce4f3281c (diff) | |
Assume burn-in when making ISDCF name unless we definitely have non-burnt subs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 6 | ||||
| -rw-r--r-- | src/wx/dcp_panel.cc | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index b80962ead..828313dcb 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -638,15 +638,15 @@ Film::isdcf_name (bool if_created_now) const d << "_" << dm.audio_language; if (!dm.subtitle_language.empty()) { - bool burnt_in = false; + bool burnt_in = true; BOOST_FOREACH (shared_ptr<Content> i, content ()) { shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (i); if (!sc) { continue; } - if (sc->use_subtitles() && sc->burn_subtitles()) { - burnt_in = true; + if (sc->use_subtitles() && !sc->burn_subtitles()) { + burnt_in = false; } } diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 34a22b844..bc3309a6b 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -412,6 +412,9 @@ DCPPanel::film_changed (int p) case Film::UPLOAD_AFTER_MAKE_DCP: checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ()); break; + case Film::CONTENT: + setup_dcp_name (); + break; default: break; } |