summaryrefslogtreecommitdiff
path: root/src/util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-03-01 20:29:13 +0100
committerCarl Hetherington <cth@carlh.net>2022-03-01 20:29:13 +0100
commite61267217a8ca7e65ad42bf34b6488b92eca6389 (patch)
tree540d5e509f1580c25e70d6abe504de600fc8edee /src/util.cc
parentbb8def962ae0092238d2263c1a2335b0206c4dc4 (diff)
Make dcp::init() take a general resources directory rather than specifically tags.
Diffstat (limited to 'src/util.cc')
-rw-r--r--src/util.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/util.cc b/src/util.cc
index 5133a43b..7a5733c2 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -170,7 +170,7 @@ dcp::empty_or_white_space (string s)
void
-dcp::init (optional<boost::filesystem::path> tags_directory)
+dcp::init (optional<boost::filesystem::path> given_resources_directory)
{
if (xmlSecInit() < 0) {
throw MiscError ("could not initialise xmlsec");
@@ -194,11 +194,7 @@ dcp::init (optional<boost::filesystem::path> tags_directory)
asdcp_smpte_dict = &ASDCP::DefaultSMPTEDict();
- if (!tags_directory) {
- tags_directory = resources_directory() / "tags";
- }
-
- load_language_tag_lists (*tags_directory);
+ load_language_tag_lists (given_resources_directory.get_value_or(resources_directory()) / "tags");
}