X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=30271283b27e1b2bdec84b50eba9054648b17dfc;hb=53c7f717da44c6ff681bde8946875e4f39764b25;hp=28af9b30334b8ee6caf4c599df20666738d1ec65;hpb=89abe02431bd8d885197883a3ffafdc8d836dce4;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 28af9b303..30271283b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -160,6 +160,10 @@ Config::set_defaults ()
 	_barco_password = optional<string>();
 	_christie_username = optional<string>();
 	_christie_password = optional<string>();
+	_gdc_username = optional<string>();
+	_gdc_password = optional<string>();
+	_interface_complexity = INTERFACE_SIMPLE;
+	_player_mode = PLAYER_MODE_WINDOW;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -471,6 +475,21 @@ try
 	_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");
+
+	optional<string> ic = f.optional_string_child("InterfaceComplexity");
+	if (ic && *ic == "full") {
+		_interface_complexity = INTERFACE_FULL;
+	}
+	optional<string> pm = f.optional_string_child("PlayerMode");
+	if (pm && *pm == "window") {
+		_player_mode = PLAYER_MODE_WINDOW;
+	} else if (pm && *pm == "full") {
+		_player_mode = PLAYER_MODE_FULL;
+	} else if (pm && *pm == "dual") {
+		_player_mode = PLAYER_MODE_DUAL;
+	}
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -829,6 +848,34 @@ Config::write_config () const
 		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);
+	}
+
+	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;
+	}
+
+	switch (_player_mode) {
+	case PLAYER_MODE_WINDOW:
+		root->add_child("PlayerMode")->add_child_text("window");
+		break;
+	case PLAYER_MODE_FULL:
+		root->add_child("PlayerMode")->add_child_text("full");
+		break;
+	case PLAYER_MODE_DUAL:
+		root->add_child("PlayerMode")->add_child_text("dual");
+		break;
+	}
+
 	try {
 		doc.write_to_file_formatted(config_file().string());
 	} catch (xmlpp::exception& e) {