diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-25 02:13:49 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-25 02:13:49 +0200 |
| commit | 36e8f32c7bdb8b257e22977d8fac86536368d7b8 (patch) | |
| tree | a7ae9eda1e147be382899083bed0e348a3bcff8a /src | |
| parent | db6882af015dc067baed605b11d8dfa3c3dcb7e3 (diff) | |
| parent | 3ed79bd632560efcc3a0f3992eeb9868b315be58 (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.cc | 2 | ||||
| -rw-r--r-- | src/wx/full_config_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 1 | ||||
| -rw-r--r-- | src/wx/verify_dcp_result_panel.cc | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index b30006498..cd285abd1 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1513,7 +1513,7 @@ void Config::copy_and_link (boost::filesystem::path new_file) const { write (); - dcp::filesystem::copy_file(config_read_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists); + dcp::filesystem::copy_file(config_read_file(), new_file, dcp::filesystem::CopyOptions::OVERWRITE_EXISTING); link (new_file); } diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 585caa2db..0291d4fa6 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -196,7 +196,7 @@ private: ); if (dialog.ShowModal() == wxID_OK) { - dcp::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(dialog.GetPath()), boost::filesystem::copy_option::overwrite_if_exists); + dcp::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(dialog.GetPath()), dcp::filesystem::CopyOptions::OVERWRITE_EXISTING); } } diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 1a5f7ce27..5d7b2f1e2 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -570,6 +570,7 @@ supported_by.Add (wxT ("Big Island Drive In")); supported_by.Add (wxT ("Dayton Movies Inc")); supported_by.Add (wxT ("Buttons Sound Inc")); supported_by.Add (wxT ("Paramount Twin Inc")); +supported_by.Add (wxT ("A Cut Above Video Productions, Inc.")); supported_by.Add (wxT ("Mya Studios Inc.")); supported_by.Add (wxT ("Gold Pictures Inc.")); supported_by.Add (wxT ("First Nations Film And Video Festival Inc.")); diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc index 9f60a41f4..d6232f984 100644 --- a/src/wx/verify_dcp_result_panel.cc +++ b/src/wx/verify_dcp_result_panel.cc @@ -596,6 +596,9 @@ VerifyDCPResultPanel::fill(shared_ptr<VerifyDCPJob> job) case dcp::VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT: /* These are all "OK" messages which we don't report here */ break; + case dcp::VerificationNote::Code::INVALID_PKL_NAMESPACE: + add(i.second, _("The PKL %f has an invalid namespace %n")); + break; } } |