diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-01 20:29:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-14 23:05:31 +0100 |
| commit | a023022cfb2b5cc6369ca22f3a99a8dc0831f790 (patch) | |
| tree | 2e52091d611922ae0ccf223868a54bbb65d25da4 /src/util.cc | |
| parent | 5f582d5f8faf4592a49180214741e7cca492749f (diff) | |
Make dcp::init() take a general resources directory rather than specifically tags.
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 8 |
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"); } |