X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=d93fd31b2ce023c6730c7ba67d46389c711281ae;hp=174d625b8c1eea2fdee199f36b67203a83540cd7;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=494c263c852d1e37be809920cb72e76a29c4ef08 diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 174d625b8..d93fd31b2 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,7 @@ #include "timeline_video_content_view.h" #include "timeline_audio_content_view.h" #include "content_properties_dialog.h" +#include "content_advanced_dialog.h" #include "lib/playlist.h" #include "lib/film.h" #include "lib/image_content.h" @@ -35,20 +36,27 @@ #include "lib/dcp_examiner.h" #include "lib/ffmpeg_content.h" #include "lib/audio_content.h" +#include "lib/config.h" +#include "lib/copy_dcp_details_to_film.h" #include #include +#include #include #include -#include #include using std::cout; using std::vector; using std::exception; using std::list; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; +using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + enum { /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */ @@ -56,10 +64,12 @@ enum { ID_join, ID_find_missing, ID_properties, + ID_advanced, ID_re_examine, ID_kdm, ID_ov, ID_choose_cpl, + ID_set_dcp_settings, ID_remove }; @@ -72,12 +82,14 @@ ContentMenu::ContentMenu (wxWindow* p) _join = _menu->Append (ID_join, _("Join")); _find_missing = _menu->Append (ID_find_missing, _("Find missing...")); _properties = _menu->Append (ID_properties, _("Properties...")); + _advanced = _menu->Append (ID_advanced, _("Advanced settings...")); _re_examine = _menu->Append (ID_re_examine, _("Re-examine...")); _menu->AppendSeparator (); _kdm = _menu->Append (ID_kdm, _("Add KDM...")); _ov = _menu->Append (ID_ov, _("Add OV...")); _cpl_menu = new wxMenu (); _choose_cpl = _menu->Append (ID_choose_cpl, _("Choose CPL..."), _cpl_menu); + _set_dcp_settings = _menu->Append (ID_set_dcp_settings, _("Set project DCP settings from this DCP")); _menu->AppendSeparator (); _remove = _menu->Append (ID_remove, _("Remove")); @@ -85,9 +97,11 @@ ContentMenu::ContentMenu (wxWindow* p) _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties); + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::advanced, this), ID_advanced); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov); + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::set_dcp_settings, this), ID_set_dcp_settings); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::remove, this), ID_remove); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1); } @@ -107,7 +121,7 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _repeat->Enable (!_content.empty ()); int n = 0; - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { if (dynamic_pointer_cast (i)) { ++n; } @@ -117,6 +131,7 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ()); _properties->Enable (_content.size() == 1); + _advanced->Enable (_content.size() == 1); _re_examine->Enable (!_content.empty ()); if (_content.size() == 1) { @@ -124,14 +139,15 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList if (dcp) { _kdm->Enable (dcp->encrypted ()); _ov->Enable (dcp->needs_assets ()); + _set_dcp_settings->Enable (static_cast(dcp)); try { - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); list > cpls = ex.cpls (); _choose_cpl->Enable (cpls.size() > 1); /* We can't have 0 as a menu item ID on OS X */ int id = 1; - BOOST_FOREACH (shared_ptr i, cpls) { - wxMenuItem* item = _cpl_menu->AppendCheckItem ( + for (auto i: cpls) { + wxMenuItem* item = _cpl_menu->AppendRadioItem ( id++, wxString::Format ( "%s (%s)", @@ -141,16 +157,22 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList ); item->Check (dcp->cpl() && dcp->cpl() == i->id()); } - } catch (dcp::DCPReadError) { + } catch (dcp::ReadError &) { /* The DCP is probably missing */ + } catch (dcp::KDMDecryptionError &) { + /* We have an incorrect KDM */ + } catch (KDMError &) { + /* We have an incorrect KDM */ } } else { _kdm->Enable (false); _ov->Enable (false); _choose_cpl->Enable (false); + _set_dcp_settings->Enable (false); } } else { _kdm->Enable (false); + _set_dcp_settings->Enable (false); } _remove->Enable (!_content.empty ()); @@ -160,6 +182,22 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _pop_up_open = false; } + +void +ContentMenu::set_dcp_settings () +{ + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + DCPOMATIC_ASSERT (_content.size() == 1); + shared_ptr dcp = dynamic_pointer_cast(_content.front()); + DCPOMATIC_ASSERT (dcp); + copy_dcp_details_to_film (dcp, film); +} + + void ContentMenu::repeat () { @@ -189,7 +227,7 @@ void ContentMenu::join () { vector > fc; - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { shared_ptr f = dynamic_pointer_cast (i); if (f) { fc.push_back (f); @@ -204,7 +242,7 @@ ContentMenu::join () } try { - shared_ptr joined (new FFmpegContent (film, fc)); + shared_ptr joined (new FFmpegContent(fc)); film->remove_content (_content); film->examine_and_add_content (joined); } catch (JoinError& e) { @@ -230,7 +268,7 @@ ContentMenu::remove () /* Special case: we only remove FFmpegContent if its video view is selected; if not, and its audio view is selected, we unmap the audio. */ - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { shared_ptr fc = dynamic_pointer_cast (i); if (!fc) { continue; @@ -239,7 +277,7 @@ ContentMenu::remove () shared_ptr video; shared_ptr audio; - BOOST_FOREACH (shared_ptr j, _views) { + for (auto j: _views) { shared_ptr v = dynamic_pointer_cast (j); shared_ptr a = dynamic_pointer_cast (j); if (v && v->content() == fc) { @@ -301,9 +339,9 @@ ContentMenu::find_missing () if (r == wxID_OK) { if (dc) { - content.push_back (shared_ptr (new DCPContent (film, path))); + content.push_back (shared_ptr(new DCPContent(path))); } else { - content = content_factory (film, path); + content = content_factory (path); } } @@ -311,16 +349,16 @@ ContentMenu::find_missing () return; } - BOOST_FOREACH (shared_ptr i, content) { + for (auto i: content) { shared_ptr j (new ExamineContentJob (film, i)); j->Finished.connect ( bind ( &ContentMenu::maybe_found_missing, this, - boost::weak_ptr (j), - boost::weak_ptr (_content.front ()), - boost::weak_ptr (i) + std::weak_ptr (j), + std::weak_ptr (_content.front ()), + std::weak_ptr (i) ) ); @@ -336,7 +374,7 @@ ContentMenu::re_examine () return; } - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, i))); } } @@ -372,14 +410,48 @@ ContentMenu::kdm () wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM")); if (d->ShowModal() == wxID_OK) { + optional kdm; try { - dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); + kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)); } catch (exception& e) { - error_dialog (_parent, wxString::Format (_("Could not load KDM (%s)"), e.what ())); + error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what())); d->Destroy (); return; } + /* Try to decrypt it to get an early preview of any errors */ + try { + decrypt_kdm_with_helpful_error (*kdm); + } catch (KDMError& e) { + error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail())); + return; + } catch (exception& e) { + error_dialog (_parent, e.what()); + return; + } + + DCPExaminer ex (dcp, true); + + bool kdm_matches_any_cpl = false; + for (auto i: ex.cpls()) { + if (i->id() == kdm->cpl_id()) { + kdm_matches_any_cpl = true; + } + } + + bool kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get(); + + if (!kdm_matches_any_cpl) { + error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one.")); + return; + } + + if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) { + message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one. To play the currently-selected CPL you will need a different KDM.")); + } + + dcp->add_kdm (*kdm); + shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); @@ -410,11 +482,23 @@ ContentMenu::ov () void ContentMenu::properties () { - ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ()); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front()); + d->ShowModal (); + d->Destroy (); +} + + +void +ContentMenu::advanced () +{ + ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front()); d->ShowModal (); d->Destroy (); } + void ContentMenu::cpl_selected (wxCommandEvent& ev) { @@ -426,7 +510,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) shared_ptr dcp = dynamic_pointer_cast (_content.front ()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); list > cpls = ex.cpls (); DCPOMATIC_ASSERT (ev.GetId() > 0); DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));