From d4bdbb21755b52094988ade47fb51a5698def744 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Apr 2016 11:07:09 +0100 Subject: [PATCH] Assume burn-in when making ISDCF name unless we definitely have non-burnt subs. --- ChangeLog | 3 +++ src/lib/film.cc | 6 +++--- src/wx/dcp_panel.cc | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2ebe0fb5..73e6a7e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-04-25 c.hetherington + * When making up the ISDCF name assume subtitles are burnt in unless + we know otherwise. + * Fix saving of modified video frame rates for subtitle content. 2016-04-25 Carl Hetherington 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 i, content ()) { shared_ptr sc = dynamic_pointer_cast (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; } -- 2.30.2