diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-20 00:25:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-11-20 21:37:37 +0100 |
| commit | 7b439c9baf719b135922e6c6b53472915fed3573 (patch) | |
| tree | 96493aefa814e5d2bcd73d1bab057d8e6f62d643 /src/tools | |
| parent | 9b5cff118fe03649c0c404b35f2900ff36008637 (diff) | |
Verify encrypted DCPs (more) correctly (#2659).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index d1668975c..212169d84 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -713,6 +713,7 @@ private: _viewer.set_coalesce_player_changes(true); for (auto path: dialog.paths()) { dcp->add_kdm(dcp::EncryptedKDM(dcp::file_to_string(path))); + _kdms.push_back(path); } examine_content(); } @@ -913,7 +914,7 @@ private: auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT (dcp); - auto job = make_shared<VerifyDCPJob>(dcp->directories()); + auto job = make_shared<VerifyDCPJob>(dcp->directories(), _kdms); VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player")); bool const completed = progress.run(job); progress.Close(); @@ -1125,6 +1126,8 @@ private: wxMenuItem* _view_dual_screen = nullptr; wxSizer* _main_sizer = nullptr; PlayerStressTester _stress; + /** KDMs that have been loaded, so that we can pass them to the verifier */ + std::vector<boost::filesystem::path> _kdms; }; static const wxCmdLineEntryDesc command_line_description[] = { |