summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-05-09 22:46:59 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-29 10:35:55 +0200
commit8564032fd9e4831c9cb2b95cbe05b3616b40a641 (patch)
tree25d8e4af00fd7428fa7943305681818b083921e6 /src/lib
parent0e1a20f2717c9e14d2b6675260e2229dfb145ffe (diff)
Get chain, facility, studio and distributor from template.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.cc5
-rw-r--r--src/lib/config.h4
-rw-r--r--src/lib/film.cc4
3 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2b435aa7b..0508d0069 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -797,11 +797,6 @@ Config::write_config () const
/* [XML] DefaultTerritory Default territory to use for new films */
cxml::add_text_child(root, "DefaultTerritory", _default_territory->subtag());
}
- for (auto const& i: _default_metadata) {
- auto c = cxml::add_child(root, "DefaultMetadata");
- c->set_attribute("key", i.first);
- c->add_child_text(i.second);
- }
if (_default_kdm_directory) {
/* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */
cxml::add_text_child(root, "DefaultKDMDirectory", _default_kdm_directory->string ());
diff --git a/src/lib/config.h b/src/lib/config.h
index 4635f8508..d6a389cc9 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -814,10 +814,6 @@ public:
maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
}
- void set_default_metadata (std::map<std::string, std::string> const& metadata) {
- maybe_set (_default_metadata, metadata);
- }
-
void set_upload_after_make_dcp (bool u) {
maybe_set (_upload_after_make_dcp, u);
}
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 32c236d36..4ffbd8c26 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1985,6 +1985,10 @@ Film::use_template(optional<string> name)
_audio_processor = _template_film->_audio_processor;
_reel_type = _template_film->_reel_type;
_reel_length = _template_film->_reel_length;
+ _chain = _template_film->_chain;
+ _distributor = _template_film->_distributor;
+ _facility = _template_film->_facility;
+ _studio = _template_film->_studio;
}
pair<double, double>