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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 22eb5b0e2..30271283b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -162,7 +162,8 @@ Config::set_defaults ()
 	_christie_password = optional<string>();
 	_gdc_username = optional<string>();
 	_gdc_password = optional<string>();
-	_interface_complexity = INTERFACE_FULL;
+	_interface_complexity = INTERFACE_SIMPLE;
+	_player_mode = PLAYER_MODE_WINDOW;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -478,8 +479,16 @@ try
 	_gdc_password = f.optional_string_child("GDCPassword");
 
 	optional<string> ic = f.optional_string_child("InterfaceComplexity");
-	if (ic && *ic == "simple") {
-		_interface_complexity = INTERFACE_SIMPLE;
+	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 */
@@ -855,6 +864,18 @@ Config::write_config () const
 		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) {