Assume burn-in when making ISDCF name unless we definitely have non-burnt subs.

diff --git a/ChangeLog b/ChangeLog
index a2ebe0fb59f5b1ef1472b1494e9cb3fa082b73d8..73e6a7e422351536741d91a9e65053b63b91a089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-04-25  c.hetherington  <cth@carlh.net>
 
+       * 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  <cth@carlh.net>

diff --git a/src/lib/film.cc b/src/lib/film.cc
index b80962ead59c47a5bb11f64f5aefae34192d66a9..828313dcbbb9a012a3c1a0159bd618e59dde8e48 100644 (file)
--- 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 34a22b84448b06d0a03f447ff44b513435c87c4e..bc3309a6ba8e830f908307c101ffeda0003f1c2c 100644 (file)
--- 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;
        }