Bump default J2K bandwidth to 150MBit/s (#1523).

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b742756b7eb55197205a85fe6a69acbbdb0cf2ce..4ce4517f8088fbac0e89087925f5d300a3969942 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -70,7 +70,6 @@ int const Config::_current_version = 3;
 boost::signals2::signal<void ()> Config::FailedToLoad;
 boost::signals2::signal<void (string)> Config::Warning;
 boost::signals2::signal<bool (void)> Config::BadSignerChain;
-boost::optional<boost::filesystem::path> Config::override_path;
 
 /** Construct default configuration */
 Config::Config ()
@@ -89,7 +88,7 @@ Config::set_defaults ()
        _use_any_servers = true;
        _servers.clear ();
        _only_servers_encode = false;
-       _tms_protocol = PROTOCOL_SCP;
+       _tms_protocol = FILE_TRANSFER_PROTOCOL_SCP;
        _tms_ip = "";
        _tms_path = ".";
        _tms_user = "";
@@ -103,12 +102,13 @@ Config::set_defaults ()
        _default_scale_to = 0;
        _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
        _default_dcp_audio_channels = 6;
-       _default_j2k_bandwidth = 100000000;
+       _default_j2k_bandwidth = 150000000;
        _default_audio_delay = 0;
        _default_interop = true;
        _default_upload_after_make_dcp = false;
        _mail_server = "";
        _mail_port = 25;
+       _mail_protocol = EMAIL_PROTOCOL_AUTO;
        _mail_user = "";
        _mail_password = "";
        _kdm_from = "";
@@ -286,7 +286,7 @@ try
        }
 
        _only_servers_encode = f.optional_bool_child ("OnlyServersEncode").get_value_or (false);
-       _tms_protocol = static_cast<Protocol> (f.optional_number_child<int> ("TMSProtocol").get_value_or (static_cast<int> (PROTOCOL_SCP)));
+       _tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FILE_TRANSFER_PROTOCOL_SCP)));
        _tms_ip = f.string_child ("TMSIP");
        _tms_path = f.string_child ("TMSPath");
        _tms_user = f.string_child ("TMSUser");
@@ -348,6 +348,21 @@ try
 
        _mail_server = f.string_child ("MailServer");
        _mail_port = f.optional_number_child<int> ("MailPort").get_value_or (25);
+
+       {
+               /* 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;
+               } else if (protocol == "Plain") {
+                       _mail_protocol = EMAIL_PROTOCOL_PLAIN;
+               } else if (protocol == "STARTTLS") {
+                       _mail_protocol = EMAIL_PROTOCOL_STARTTLS;
+               } else if (protocol == "SSL") {
+                       _mail_protocol = EMAIL_PROTOCOL_SSL;
+               }
+       }
+
        _mail_user = f.optional_string_child("MailUser").get_value_or ("");
        _mail_password = f.optional_string_child("MailPassword").get_value_or ("");
 
@@ -593,33 +608,6 @@ catch (...) {
        write ();
 }
 
-/** @return Filename to write configuration to */
-boost::filesystem::path
-Config::path (string file, bool create_directories)
-{
-       boost::filesystem::path p;
-       if (override_path) {
-               p = *override_path;
-       } else {
-#ifdef DCPOMATIC_OSX
-               p /= g_get_home_dir ();
-               p /= "Library";
-               p /= "Preferences";
-               p /= "com.dcpomatic";
-               p /= "2";
-#else
-               p /= g_get_user_config_dir ();
-               p /= "dcpomatic2";
-#endif
-       }
-       boost::system::error_code ec;
-       if (create_directories) {
-               boost::filesystem::create_directories (p, ec);
-       }
-       p /= file;
-       return p;
-}
-
 /** @return Singleton instance */
 Config *
 Config::instance ()
@@ -647,7 +635,7 @@ Config::write_config () const
        xmlpp::Element* root = doc.create_root_node ("Config");
 
        /* [XML] Version The version number of the configuration file format. */
-       root->add_child("Version")->add_child_text (String::compose ("%1", _current_version));
+       root->add_child("Version")->add_child_text (raw_convert<string>(_current_version));
        /* [XML] MasterEncodingThreads Number of encoding threads to use when running as master. */
        root->add_child("MasterEncodingThreads")->add_child_text (raw_convert<string> (_master_encoding_threads));
        /* [XML] ServerEncodingThreads Number of encoding threads to use when running as server. */
@@ -747,6 +735,21 @@ Config::write_config () const
        root->add_child("MailServer")->add_child_text (_mail_server);
        /* [XML] MailPort Port number to use on SMTP server. */
        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:
+               root->add_child("MailProtocol")->add_child_text("Auto");
+               break;
+       case EMAIL_PROTOCOL_PLAIN:
+               root->add_child("MailProtocol")->add_child_text("Plain");
+               break;
+       case EMAIL_PROTOCOL_STARTTLS:
+               root->add_child("MailProtocol")->add_child_text("STARTTLS");
+               break;
+       case EMAIL_PROTOCOL_SSL:
+               root->add_child("MailProtocol")->add_child_text("SSL");
+               break;
+       }
        /* [XML] MailUser Username to use on SMTP server. */
        root->add_child("MailUser")->add_child_text (_mail_user);
        /* [XML] MailPassword Password to use on SMTP server. */