diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-15 19:56:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-15 19:56:34 +0100 |
| commit | 7d293a3268c320f474d42fef15548635c3cb40b0 (patch) | |
| tree | d5b6fddfee25a780059fdeae5e838bb2a6d2e1ec /src/lib/config.cc | |
| parent | 4d1f0c6e97656a815f49f9240edb6bc427c58cc6 (diff) | |
| parent | 32e2c7b2a3cfabc9110f0b4720cc5d48185f9934 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 7e2cdabf6..76c70ed5d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -156,6 +156,12 @@ Config::set_defaults () for (int i = 0; i < NOTIFICATION_COUNT; ++i) { _notification[i] = false; } + _barco_username = optional<string>(); + _barco_password = optional<string>(); + _christie_username = optional<string>(); + _christie_password = optional<string>(); + _gdc_username = optional<string>(); + _gdc_password = optional<string>(); _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -463,6 +469,13 @@ try } } + _barco_username = f.optional_string_child("BarcoUsername"); + _barco_password = f.optional_string_child("BarcoPassword"); + _christie_username = f.optional_string_child("ChristieUsername"); + _christie_password = f.optional_string_child("ChristiePassword"); + _gdc_username = f.optional_string_child("GDCUsername"); + _gdc_password = f.optional_string_child("GDCPassword"); + /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) { cxml::Document f ("Cinemas"); @@ -806,6 +819,27 @@ Config::write_config () const e->add_child_text (_notification[i] ? "1" : "0"); } + if (_barco_username) { + root->add_child("BarcoUsername")->add_child_text(*_barco_username); + } + if (_barco_password) { + root->add_child("BarcoPassword")->add_child_text(*_barco_password); + } + + if (_christie_username) { + root->add_child("ChristieUsername")->add_child_text(*_christie_username); + } + if (_christie_password) { + root->add_child("ChristiePassword")->add_child_text(*_christie_password); + } + + if (_gdc_username) { + root->add_child("GDCUsername")->add_child_text(*_gdc_username); + } + if (_gdc_password) { + root->add_child("GDCPassword")->add_child_text(*_gdc_password); + } + try { doc.write_to_file_formatted(config_file().string()); } catch (xmlpp::exception& e) { |