projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remember the path used for "add files" (#2049).
[dcpomatic.git]
/
src
/
lib
/
config.cc
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index 6ec3b0588fcfcd0c47a22b4fd2099fe18c00e630..a8653a10c891a2dd766fc89b140498443a63c03e 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-103,7
+103,7
@@
Config::set_defaults ()
_default_dcp_audio_channels = 6;
_default_j2k_bandwidth = 150000000;
_default_audio_delay = 0;
_default_dcp_audio_channels = 6;
_default_j2k_bandwidth = 150000000;
_default_audio_delay = 0;
- _default_interop =
tru
e;
+ _default_interop =
fals
e;
_upload_after_make_dcp = false;
_mail_server = "";
_mail_port = 25;
_upload_after_make_dcp = false;
_mail_server = "";
_mail_port = 25;
@@
-175,8
+175,8
@@
Config::set_defaults ()
_player_playlist_directory = boost::none;
_player_kdm_directory = boost::none;
_audio_mapping = boost::none;
_player_playlist_directory = boost::none;
_player_kdm_directory = boost::none;
_audio_mapping = boost::none;
- _minimum_frame_size = 65536;
_custom_languages.clear ();
_custom_languages.clear ();
+ _add_files_path = boost::none;
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
_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);
}
_audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version);
}
- _minimum_frame_size = f.optional_number_child<int>("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
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) {}
}
} 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);
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"));
}
if (_audio_mapping) {
_audio_mapping->as_xml (root->add_child("AudioMapping"));
}
- root->add_child("MinimumFrameSize")->add_child_text(raw_convert<string>(_minimum_frame_size));
for (auto const& i: _custom_languages) {
root->add_child("CustomLanguage")->add_child_text(i.to_string());
}
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 ();
try {
auto const s = doc.write_to_string_formatted ();