X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=ec966b81a5ac9e95bcfa4e32a15eb590d3da19b6;hp=e5cadd7942870f90512d57f2320fc1cd2f2e7a88;hb=dda7d841eac2305379aa86d11249dbb4b98d5bb7;hpb=6f856af55898f94b45e3be28aa4f7c962de8a398 diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index e5cadd794..ec966b81a 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" @@ -36,6 +37,7 @@ #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 @@ -50,6 +52,7 @@ using std::list; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using boost::optional; enum { /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */ @@ -57,10 +60,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 }; @@ -73,12 +78,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")); @@ -86,9 +93,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); } @@ -118,6 +127,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) { @@ -125,8 +135,9 @@ 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 */ @@ -142,7 +153,7 @@ 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 */ @@ -153,9 +164,11 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _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 ()); @@ -165,6 +178,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 () { @@ -377,14 +406,38 @@ 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, _("Could not load KDM"), std_to_wx(e.what())); d->Destroy (); return; } + DCPExaminer ex (dcp, true); + + bool kdm_matches_any_cpl = false; + BOOST_FOREACH (shared_ptr 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))); @@ -422,6 +475,16 @@ ContentMenu::properties () d->Destroy (); } + +void +ContentMenu::advanced () +{ + ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front()); + d->ShowModal (); + d->Destroy (); +} + + void ContentMenu::cpl_selected (wxCommandEvent& ev) { @@ -433,7 +496,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()));