diff options
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 21 | ||||
| -rw-r--r-- | src/wx/controls.cc | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 07583ccaf..db9b21d92 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -315,6 +315,27 @@ public: return; } + /* The DCP has been examined and loaded */ + + optional<boost::filesystem::path> kdm_dir = Config::instance()->player_kdm_directory(); + if (dcp->needs_kdm() && kdm_dir) { + /* Look for a KDM */ + using namespace boost::filesystem; + for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) { + if (file_size(i->path()) < MAX_KDM_SIZE) { + try { + dcp::EncryptedKDM kdm(dcp::file_to_string(i->path())); + if (kdm.cpl_id() == dcp->cpl()) { + dcp->add_kdm (kdm); + dcp->examine (shared_ptr<Job>()); + } + } catch (...) { + /* Hey well */ + } + } + } + } + setup_from_dcp (dcp); if (dcp->three_d()) { diff --git a/src/wx/controls.cc b/src/wx/controls.cc index bc373812d..1f6a30ae9 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -83,6 +83,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor e_sizer->Add (_log, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); _dcp_directory->Show (false); + _log->Show (false); _v_sizer->Add (e_sizer, 0, wxEXPAND); @@ -457,6 +458,7 @@ void Controls::show_extended_player_controls (bool s) { _dcp_directory->Show (s); + _log->Show (s); } void |