set_backtrace_file (file ("backtrace.txt"));
}
+ /* Around 2.15.108 we removed subtitle language state from the text content and the ISDCF
+ * metadata and put it into the Film instead. If we've loaded an old Film let's try and fish
+ * out the settings from where they were so that they don't get lost.
+ */
+
+ optional<dcp::LanguageTag> found_language;
+
+ BOOST_FOREACH (cxml::ConstNodePtr i, f.node_child("Playlist")->node_children("Content")) {
+ cxml::ConstNodePtr text = i->optional_node_child("Text");
+ if (text && text->optional_string_child("Language") && !found_language) {
+ try {
+ found_language = dcp::LanguageTag(text->string_child("Language"));
+ } catch (...) {}
+ }
+ }
+
+ optional<string> isdcf_language = f.node_child("ISDCFMetadata")->optional_string_child("SubtitleLanguage");
+ if (isdcf_language && !found_language) {
+ try {
+ found_language = dcp::LanguageTag(*isdcf_language);
+ } catch (...) {
+ try {
+ found_language = dcp::LanguageTag(boost::algorithm::to_lower_copy(*isdcf_language));
+ } catch (...) {
+
+ }
+ }
+ }
+
+ if (found_language) {
+ _subtitle_languages.push_back (*found_language);
+ }
+
_dirty = false;
return notes;
}
--- /dev/null
+/*
+ Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ DCP-o-matic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+/** @file test/subtitle_metadata_test.cc
+ * @brief Test that subtitle language metadata is recovered from metadata files
+ * written by versions before the subtitle language was only stored in Film.
+ */
+
+
+#include "lib/film.h"
+#include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/test/unit_test.hpp>
+
+
+using std::vector;
+using boost::shared_ptr;
+
+
+BOOST_AUTO_TEST_CASE (subtitle_metadata_test1)
+{
+ using namespace boost::filesystem;
+
+ path p = test_film_dir ("subtitle_metadata_test1");
+ if (exists (p)) {
+ remove_all (p);
+ }
+ create_directory (p);
+
+ copy_file ("test/data/subtitle_metadata1.xml", p / "metadata.xml");
+ shared_ptr<Film> film(new Film(p));
+ film->read_metadata();
+
+ vector<dcp::LanguageTag> langs = film->subtitle_languages ();
+ BOOST_REQUIRE (!langs.empty());
+ BOOST_CHECK_EQUAL (langs.front().to_string(), "de-DE");
+}
+
+
+BOOST_AUTO_TEST_CASE (subtitle_metadata_test2)
+{
+ using namespace boost::filesystem;
+
+ path p = test_film_dir ("subtitle_metadata_test2");
+ if (exists (p)) {
+ remove_all (p);
+ }
+ create_directory (p);
+
+ copy_file ("test/data/subtitle_metadata2.xml", p / "metadata.xml");
+ shared_ptr<Film> film(new Film(p));
+ film->read_metadata();
+
+ vector<dcp::LanguageTag> langs = film->subtitle_languages ();
+ BOOST_REQUIRE (!langs.empty());
+ BOOST_CHECK_EQUAL (langs.front().to_string(), "fr");
+}
+