X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=a8653a10c891a2dd766fc89b140498443a63c03e;hb=76e543bd7c85054ff857781707fa570f2b159360;hp=4404c83144d23dceb143ea016ec509144d0050d0;hpb=2d10f2ed6596cae02a6ed7321c5c79ffef4ef75b;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 4404c8314..a8653a10c 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -175,8 +175,8 @@ Config::set_defaults () _player_playlist_directory = boost::none; _player_kdm_directory = boost::none; _audio_mapping = boost::none; - _minimum_frame_size = 65536; _custom_languages.clear (); + _add_files_path = boost::none; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -545,8 +545,6 @@ try _audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version); } - _minimum_frame_size = f.optional_number_child("MinimumFrameSize").get_value_or(65536); - for (auto i: f.node_children("CustomLanguage")) { try { /* This will fail if it's called before dcp::init() as it won't recognise the @@ -556,6 +554,8 @@ try } catch (std::runtime_error& e) {} } + _add_files_path = f.optional_string_child("AddFilesPath"); + if (boost::filesystem::exists (_cinemas_file)) { cxml::Document f ("Cinemas"); f.read_file (_cinemas_file); @@ -976,10 +976,13 @@ Config::write_config () const if (_audio_mapping) { _audio_mapping->as_xml (root->add_child("AudioMapping")); } - root->add_child("MinimumFrameSize")->add_child_text(raw_convert(_minimum_frame_size)); for (auto const& i: _custom_languages) { root->add_child("CustomLanguage")->add_child_text(i.to_string()); } + if (_add_files_path) { + /* [XML] The default path that will be offered in the picker when adding files to a film */ + root->add_child("AddFilesPath")->add_child_text(_add_files_path->string()); + } try { auto const s = doc.write_to_string_formatted ();