Use boost::optional for Config::_default_directory.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 872900a73ec6d3b5730b73b9b9d58d2f28ff4b2e..30ed1243b6890e70e010e4263ca1878c252761db 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -92,7 +92,7 @@ Config::set_defaults ()
        _default_dcp_audio_channels = 6;
        _default_j2k_bandwidth = 100000000;
        _default_audio_delay = 0;
-       _default_interop = false;
+       _default_interop = true;
        _mail_server = "";
        _mail_port = 25;
        _mail_user = "";
@@ -111,6 +111,7 @@ Config::set_defaults ()
 #endif
        _cinemas_file = path ("cinemas.xml");
        _show_hints_before_make_dcp = true;
+       _confirm_kdm_email = true;
        _kdm_filename_format = dcp::NameFormat ("KDM %f %c %s");
        _dcp_metadata_filename_format = dcp::NameFormat ("%t");
        _dcp_asset_filename_format = dcp::NameFormat ("%t");
@@ -159,7 +160,11 @@ try
        optional<int> version = f.optional_number_child<int> ("Version");
 
        _num_local_encoding_threads = f.number_child<int> ("NumLocalEncodingThreads");
-       _default_directory = f.string_child ("DefaultDirectory");
+       _default_directory = f.optional_string_child ("DefaultDirectory");
+       if (_default_directory && _default_directory->empty ()) {
+               /* We used to store an empty value for this to mean "none set" */
+               _default_directory = boost::optional<boost::filesystem::path> ();
+       }
 
        boost::optional<int> b = f.optional_number_child<int> ("ServerPort");
        if (!b) {
@@ -296,6 +301,7 @@ try
 
        _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ());
        _show_hints_before_make_dcp = f.optional_bool_child("ShowHintsBeforeMakeDCP").get_value_or (true);
+       _confirm_kdm_email = f.optional_bool_child("ConfirmKDMEmail").get_value_or (true);
        _kdm_filename_format = dcp::NameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s"));
        _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t"));
        _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t"));
@@ -372,7 +378,9 @@ Config::write_config_xml () const
 
        root->add_child("Version")->add_child_text ("2");
        root->add_child("NumLocalEncodingThreads")->add_child_text (raw_convert<string> (_num_local_encoding_threads));
-       root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
+       if (_default_directory) {
+               root->add_child("DefaultDirectory")->add_child_text (_default_directory->string ());
+       }
        root->add_child("ServerPortBase")->add_child_text (raw_convert<string> (_server_port_base));
        root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0");
 
@@ -456,6 +464,7 @@ Config::write_config_xml () const
 
        root->add_child("CinemasFile")->add_child_text (_cinemas_file.string());
        root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0");
+       root->add_child("ConfirmKDMEmail")->add_child_text (_confirm_kdm_email ? "1" : "0");
        root->add_child("KDMFilenameFormat")->add_child_text (_kdm_filename_format.specification ());
        root->add_child("DCPMetadataFilenameFormat")->add_child_text (_dcp_metadata_filename_format.specification ());
        root->add_child("DCPAssetFilenameFormat")->add_child_text (_dcp_asset_filename_format.specification ());
@@ -492,17 +501,17 @@ Config::write_cinemas_xml () const
 boost::filesystem::path
 Config::default_directory_or (boost::filesystem::path a) const
 {
-       if (_default_directory.empty()) {
+       if (!_default_directory) {
                return a;
        }
 
        boost::system::error_code ec;
-       bool const e = boost::filesystem::exists (_default_directory, ec);
+       bool const e = boost::filesystem::exists (*_default_directory, ec);
        if (ec || !e) {
                return a;
        }
 
-       return _default_directory;
+       return *_default_directory;
 }
 
 void