diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-09 23:01:08 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-29 10:35:55 +0200 |
| commit | 54ca1dbbea600c3afe3a3513bf81804616df80db (patch) | |
| tree | 043dc7f690a09e3b9caf949fb79f7ef064455a45 /src/lib | |
| parent | 8564032fd9e4831c9cb2b95cbe05b3616b40a641 (diff) | |
Use territory details from template.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 4 | ||||
| -rw-r--r-- | src/lib/config.h | 8 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 0508d0069..bbf0539e4 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -793,10 +793,6 @@ Config::write_config () const /* [XML] DefaultAudioLanguage Default audio language to use for new films */ cxml::add_text_child(root, "DefaultAudioLanguage", _default_audio_language->to_string()); } - if (_default_territory) { - /* [XML] DefaultTerritory Default territory to use for new films */ - cxml::add_text_child(root, "DefaultTerritory", _default_territory->subtag()); - } 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 d6a389cc9..397af2222 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -806,14 +806,6 @@ public: maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>()); } - void set_default_territory(dcp::LanguageTag::RegionSubtag tag) { - maybe_set(_default_territory, tag); - } - - void unset_default_territory() { - maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>()); - } - 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 4ffbd8c26..4dff0bd76 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1989,6 +1989,8 @@ Film::use_template(optional<string> name) _distributor = _template_film->_distributor; _facility = _template_film->_facility; _studio = _template_film->_studio; + _territory_type = _template_film->_territory_type; + _release_territory = _template_film->_release_territory; } pair<double, double> |