X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=eda45afff4a166b462be689e978613d6182b41c8;hb=ef578569611e2fa0e91bdd5a726fc0c251540e6d;hp=eae57cc06f365195683780fb9d4c8358a576bcf4;hpb=444809fb888ed99803f2d19c94d3faef067cf348;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index eae57cc06..eda45afff 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -88,7 +88,7 @@ Config::set_defaults ()
 	_use_any_servers = true;
 	_servers.clear ();
 	_only_servers_encode = false;
-	_tms_protocol = FILE_TRANSFER_PROTOCOL_SCP;
+	_tms_protocol = FileTransferProtocol::SCP;
 	_tms_ip = "";
 	_tms_path = ".";
 	_tms_user = "";
@@ -107,7 +107,7 @@ Config::set_defaults ()
 	_upload_after_make_dcp = false;
 	_mail_server = "";
 	_mail_port = 25;
-	_mail_protocol = EMAIL_PROTOCOL_AUTO;
+	_mail_protocol = EmailProtocol::AUTO;
 	_mail_user = "";
 	_mail_password = "";
 	_kdm_from = "";
@@ -175,6 +175,7 @@ Config::set_defaults ()
 	_player_playlist_directory = boost::none;
 	_player_kdm_directory = boost::none;
 	_audio_mapping = boost::none;
+	_minimum_frame_size = 65536;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -269,7 +270,7 @@ try
 	}
 
 	_only_servers_encode = f.optional_bool_child ("OnlyServersEncode").get_value_or (false);
-	_tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FILE_TRANSFER_PROTOCOL_SCP)));
+	_tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FileTransferProtocol::SCP)));
 	_tms_ip = f.string_child ("TMSIP");
 	_tms_path = f.string_child ("TMSPath");
 	_tms_user = f.string_child ("TMSUser");
@@ -331,13 +332,13 @@ try
 		/* Make sure this matches the code in write_config */
 		string const protocol = f.optional_string_child("MailProtocol").get_value_or("Auto");
 		if (protocol == "Auto") {
-			_mail_protocol = EMAIL_PROTOCOL_AUTO;
+			_mail_protocol = EmailProtocol::AUTO;
 		} else if (protocol == "Plain") {
-			_mail_protocol = EMAIL_PROTOCOL_PLAIN;
+			_mail_protocol = EmailProtocol::PLAIN;
 		} else if (protocol == "STARTTLS") {
-			_mail_protocol = EMAIL_PROTOCOL_STARTTLS;
+			_mail_protocol = EmailProtocol::STARTTLS;
 		} else if (protocol == "SSL") {
-			_mail_protocol = EMAIL_PROTOCOL_SSL;
+			_mail_protocol = EmailProtocol::SSL;
 		}
 	}
 
@@ -549,6 +550,8 @@ try
 		_audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version);
 	}
 
+	_minimum_frame_size = f.optional_number_child<int>("MinimumFrameSize").get_value_or(65536);
+
 	if (boost::filesystem::exists (_cinemas_file)) {
 		cxml::Document f ("Cinemas");
 		f.read_file (_cinemas_file);
@@ -701,16 +704,16 @@ Config::write_config () const
 	root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
 	/* [XML] MailProtocol Protocol to use on SMTP server (Auto, Plain, STARTTLS or SSL) */
 	switch (_mail_protocol) {
-	case EMAIL_PROTOCOL_AUTO:
+	case EmailProtocol::AUTO:
 		root->add_child("MailProtocol")->add_child_text("Auto");
 		break;
-	case EMAIL_PROTOCOL_PLAIN:
+	case EmailProtocol::PLAIN:
 		root->add_child("MailProtocol")->add_child_text("Plain");
 		break;
-	case EMAIL_PROTOCOL_STARTTLS:
+	case EmailProtocol::STARTTLS:
 		root->add_child("MailProtocol")->add_child_text("STARTTLS");
 		break;
-	case EMAIL_PROTOCOL_SSL:
+	case EmailProtocol::SSL:
 		root->add_child("MailProtocol")->add_child_text("SSL");
 		break;
 	}
@@ -972,6 +975,7 @@ Config::write_config () const
 	if (_audio_mapping) {
 		_audio_mapping->as_xml (root->add_child("AudioMapping"));
 	}
+	root->add_child("MinimumFrameSize")->add_child_text(raw_convert<string>(_minimum_frame_size));
 
 	try {
 		auto const s = doc.write_to_string_formatted ();
@@ -1376,14 +1380,14 @@ Config::audio_mapping (int output_channels)
 			   Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
 			   Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
 			*/
-			_audio_mapping->set (dcp::LEFT,   0, 1 / sqrt(2));  // L   -> Lt
-			_audio_mapping->set (dcp::RIGHT,  1, 1 / sqrt(2));  // R   -> Rt
-			_audio_mapping->set (dcp::CENTRE, 0, 1 / 2.0);      // C   -> Lt
-			_audio_mapping->set (dcp::CENTRE, 1, 1 / 2.0);      // C   -> Rt
-			_audio_mapping->set (dcp::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
-			_audio_mapping->set (dcp::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
-			_audio_mapping->set (dcp::LS,     0, 1 / sqrt(2));  // Ls  -> Lt
-			_audio_mapping->set (dcp::RS,     1, 1 / sqrt(2));  // Rs  -> Rt
+			_audio_mapping->set (dcp::Channel::LEFT,   0, 1 / sqrt(2));  // L   -> Lt
+			_audio_mapping->set (dcp::Channel::RIGHT,  1, 1 / sqrt(2));  // R   -> Rt
+			_audio_mapping->set (dcp::Channel::CENTRE, 0, 1 / 2.0);      // C   -> Lt
+			_audio_mapping->set (dcp::Channel::CENTRE, 1, 1 / 2.0);      // C   -> Rt
+			_audio_mapping->set (dcp::Channel::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
+			_audio_mapping->set (dcp::Channel::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
+			_audio_mapping->set (dcp::Channel::LS,     0, 1 / sqrt(2));  // Ls  -> Lt
+			_audio_mapping->set (dcp::Channel::RS,     1, 1 / sqrt(2));  // Rs  -> Rt
 		} else {
 			/* 1:1 mapping */
 			for (int i = 0; i < min (MAX_DCP_AUDIO_CHANNELS, output_channels); ++i) {