diff options
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 75dfa45eb..2ef59fe21 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -128,7 +128,6 @@ Film::Film (boost::filesystem::path dir, bool log) , _three_d (false) , _sequence_video (true) , _interop (false) - , _burn_subtitles (false) , _audio_processor (0) , _state_version (current_state_version) , _dirty (false) @@ -199,10 +198,6 @@ Film::video_identifier () const s << "_S"; } - if (_burn_subtitles) { - s << "_B"; - } - if (_three_d) { s << "_3D"; } @@ -285,13 +280,13 @@ Film::make_dcp () ContentList cl = content (); BOOST_FOREACH (shared_ptr<Content> c, cl) { shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c); - if (sc && sc->has_image_subtitles() && sc->use_subtitles() && !burn_subtitles()) { + if (sc && sc->has_image_subtitles() && sc->use_subtitles() && !sc->burn_subtitles ()) { must_burn = true; } } if (must_burn) { - throw EncodeError (_("this project has content with image-based subtitles, which this version of DCP-o-matic cannot include as separate DCP subtitles. To use subtitles with this project you must burn them into the image (tick the box on the DCP Video tab).")); + throw EncodeError (_("this project has content with image-based subtitles, which this version of DCP-o-matic cannot include as separate DCP subtitles. To use these subtitles you must burn them into the image (tick the box in the Subtitles tab).")); } set_isdcf_date_today (); @@ -359,7 +354,6 @@ Film::metadata () const root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0"); root->add_child("Interop")->add_child_text (_interop ? "1" : "0"); - root->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0"); root->add_child("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); @@ -441,9 +435,6 @@ Film::read_metadata () _sequence_video = f.bool_child ("SequenceVideo"); _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); - if (_state_version >= 32) { - _burn_subtitles = f.bool_child ("BurnSubtitles"); - } _key = dcp::Key (f.string_child ("Key")); if (f.optional_string_child ("AudioProcessor")) { @@ -819,13 +810,6 @@ Film::set_interop (bool i) } void -Film::set_burn_subtitles (bool b) -{ - _burn_subtitles = b; - signal_changed (BURN_SUBTITLES); -} - -void Film::set_audio_processor (AudioProcessor const * processor) { _audio_processor = processor; |