X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstring_text_file_content.cc;h=d8c195be77af1fe53ada9e66830d776ad4810826;hb=345df3ae8254f25299c2fc2022b1143d444f9a56;hp=01e0fe60ff490450b3e30a950f640020f4ce22dd;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc index 01e0fe60f..d8c195be7 100644 --- a/src/lib/string_text_file_content.cc +++ b/src/lib/string_text_file_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,78 +18,123 @@ */ -#include "string_text_file_content.h" -#include "util.h" -#include "string_text_file.h" + #include "film.h" #include "font.h" +#include "font_config.h" +#include "string_text_file.h" +#include "string_text_file_content.h" #include "text_content.h" +#include "util.h" #include +#include #include #include + #include "i18n.h" -using std::string; + using std::cout; -using std::shared_ptr; +using std::list; using std::make_shared; +using std::shared_ptr; +using std::string; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; + StringTextFileContent::StringTextFileContent (boost::filesystem::path path) : Content (path) { - text.push_back (shared_ptr (new TextContent (this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN))); + text.push_back (make_shared(this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN)); } -StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version) + +StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version, list& notes) : Content (node) - , _length (node->number_child ("Length")) + , _length (node->number_child("Length")) +{ + text = TextContent::from_xml (this, node, version, notes); +} + + +static +std::set +font_names(StringTextFile const& string_text_file) { - text = TextContent::from_xml (this, node, version); + std::set names; + + for (auto const& subtitle: string_text_file.subtitles()) { + for (auto const& line: subtitle.lines) { + for (auto const& block: line.blocks) { + names.insert(block.font.get_value_or("")); + } + } + } + + return names; } + void StringTextFileContent::examine (shared_ptr film, shared_ptr job) { Content::examine (film, job); - StringTextFile s (shared_from_this ()); + StringTextFile file (shared_from_this()); + + only_text()->clear_fonts(); /* Default to turning these subtitles on */ only_text()->set_use (true); + for (auto name: font_names(file)) { + optional path; + if (!name.empty()) { + path = FontConfig::instance()->system_font_with_name(name); + } + if (path) { + only_text()->add_font(make_shared(name, *path)); + } else { + only_text()->add_font(make_shared(name)); + } + } + boost::mutex::scoped_lock lm (_mutex); - _length = s.length (); - only_text()->add_font (make_shared(TEXT_FONT_ID)); + _length = file.length(); } + string StringTextFileContent::summary () const { return path_summary() + " " + _("[subtitles]"); } + string StringTextFileContent::technical_summary () const { return Content::technical_summary() + " - " + _("Text subtitles"); + } + void StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const { - node->add_child("Type")->add_child_text ("TextSubtitle"); + node->add_child("Type")->add_child_text("TextSubtitle"); Content::as_xml (node, with_paths); if (only_text()) { - only_text()->as_xml (node); + only_text()->as_xml(node); } - node->add_child("Length")->add_child_text (raw_convert (_length.get ())); + node->add_child("Length")->add_child_text(raw_convert(_length.get ())); } + DCPTime StringTextFileContent::full_length (shared_ptr film) const { @@ -97,16 +142,66 @@ StringTextFileContent::full_length (shared_ptr film) const return DCPTime (_length, frc); } + DCPTime StringTextFileContent::approximate_length () const { return DCPTime (_length, FrameRateChange()); } + string StringTextFileContent::identifier () const { - string s = Content::identifier (); + auto s = Content::identifier (); s += "_" + only_text()->identifier(); return s; } + + +/** In 5a820bb8fae34591be5ac6d19a73461b9dab532a there were some changes to subtitle font management. + * + * With StringTextFileContent we used to write a tag to the metadata with the id "font". Users + * could then set a font file that content should use, and (with some luck) it would end up in the DCP + * that way. + * + * After the changes we write a tag for every different font "id" (i.e. name) found in the source + * file (including a with id "" in the .srt case where there are no font names). + * + * However, this meant that making DCPs from old projects would fail, as the new code would see a font name + * in the source, then lookup a Font object for it from the Content, and fail in doing so (since the content + * only contains a font called "font"). + * + * To put it another way: after the changes, the code expects that any font ID (i.e. name) used in some content + * will have a in the metadata and so a Font object in the TextContent. Without that, making DCPs fails. + * + * To work around this problem, this check_font_ids() is called for all subtitle content written by DoM versions + * before 2.16.14. We find all the font IDs in the content and map them all to the "legacy" font name (if there + * is one). This is more-or-less a re-examine()-ation, except that we try to preserve any settings that + * the user had previously set up. + * + * See #2271. + */ +void +StringTextFileContent::check_font_ids() +{ + StringTextFile file (shared_from_this()); + auto names = font_names(file); + + auto content = only_text(); + optional legacy_font_file; + if (auto legacy_font = content->get_font("font")) { + legacy_font_file = legacy_font->file(); + } + + for (auto name: names) { + if (!content->get_font(name)) { + if (legacy_font_file) { + content->add_font(make_shared(name, *legacy_font_file)); + } else { + content->add_font(make_shared(name)); + } + } + } +} +