projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix interface complexity configuration.
[dcpomatic.git]
/
src
/
lib
/
config.cc
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index 76c70ed5dacbf75ca78b66f0077e18af1ba78de8..0baaf487c58c05614ddfd0a91ada3baa0d632434 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-162,6
+162,7
@@
Config::set_defaults ()
_christie_password = optional<string>();
_gdc_username = optional<string>();
_gdc_password = optional<string>();
_christie_password = optional<string>();
_gdc_username = optional<string>();
_gdc_password = optional<string>();
+ _interface_complexity = INTERFACE_SIMPLE;
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
@@
-476,6
+477,11
@@
try
_gdc_username = f.optional_string_child("GDCUsername");
_gdc_password = f.optional_string_child("GDCPassword");
_gdc_username = f.optional_string_child("GDCUsername");
_gdc_password = f.optional_string_child("GDCPassword");
+ optional<string> ic = f.optional_string_child("InterfaceComplexity");
+ if (ic && *ic == "full") {
+ _interface_complexity = INTERFACE_FULL;
+ }
+
/* Replace any cinemas from config.xml with those from the configured file */
if (boost::filesystem::exists (_cinemas_file)) {
cxml::Document f ("Cinemas");
/* Replace any cinemas from config.xml with those from the configured file */
if (boost::filesystem::exists (_cinemas_file)) {
cxml::Document f ("Cinemas");
@@
-840,6
+846,15
@@
Config::write_config () const
root->add_child("GDCPassword")->add_child_text(*_gdc_password);
}
root->add_child("GDCPassword")->add_child_text(*_gdc_password);
}
+ switch (_interface_complexity) {
+ case INTERFACE_SIMPLE:
+ root->add_child("InterfaceComplexity")->add_child_text("simple");
+ break;
+ case INTERFACE_FULL:
+ root->add_child("InterfaceComplexity")->add_child_text("full");
+ break;
+ }
+
try {
doc.write_to_file_formatted(config_file().string());
} catch (xmlpp::exception& e) {
try {
doc.write_to_file_formatted(config_file().string());
} catch (xmlpp::exception& e) {