From 0ac8235fa4addb021c0e05a9c6c19a7d22097458 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Oct 2016 10:37:19 +0100 Subject: [PATCH] Add menu option to select CPL. --- ChangeLog | 4 +++ src/lib/dcp.h | 4 ++- src/lib/dcp_content.cc | 7 +++++ src/lib/dcp_content.h | 2 ++ src/wx/content_menu.cc | 62 ++++++++++++++++++++++++++++++++++++++++-- src/wx/content_menu.h | 3 ++ 6 files changed, 79 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25cdb9d40..76f4adaa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-10-06 c.hetherington + + * Allow selection of CPL in multi-CPL DCPs (#733). + 2016-10-05 Carl Hetherington * Updated fr_FR translation from Thierry Journet. diff --git a/src/lib/dcp.h b/src/lib/dcp.h index d83f95f37..e2e83e96e 100644 --- a/src/lib/dcp.h +++ b/src/lib/dcp.h @@ -29,12 +29,14 @@ class DCPContent; class DCP { +public: + std::list > cpls () const; + protected: DCP (boost::shared_ptr content) : _dcp_content (content) {} - std::list > cpls () const; boost::shared_ptr _dcp_content; }; diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 1f844541c..0d36118e7 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -490,3 +490,10 @@ DCPContent::use_template (shared_ptr c) _reference_audio = dc->_reference_audio; _reference_subtitle = dc->_reference_subtitle; } + +void +DCPContent::set_cpl (string id) +{ + boost::mutex::scoped_lock lm (_mutex); + _cpl = id; +} diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 93a207ed7..21b654c96 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -115,6 +115,8 @@ public: bool can_reference_subtitle (std::list &) const; + void set_cpl (std::string id); + boost::optional cpl () const { boost::mutex::scoped_lock lm (_mutex); return _cpl; diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 3b1fd3189..8b41c7039 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -32,8 +32,10 @@ #include "lib/job_manager.h" #include "lib/exceptions.h" #include "lib/dcp_content.h" +#include "lib/dcp_examiner.h" #include "lib/ffmpeg_content.h" #include "lib/audio_content.h" +#include #include #include #include @@ -42,18 +44,21 @@ 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; enum { - ID_repeat = 1, + /* Start at 256 so we can have IDs on _cpl_menu from 0 to 255 */ + ID_repeat = 256, ID_join, ID_find_missing, ID_properties, ID_re_examine, ID_kdm, ID_ov, + ID_choose_cpl, ID_remove }; @@ -69,6 +74,8 @@ ContentMenu::ContentMenu (wxWindow* p) _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); _menu->AppendSeparator (); _remove = _menu->Append (ID_remove, _("Remove")); @@ -80,6 +87,8 @@ ContentMenu::ContentMenu (wxWindow* p) _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm); _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::ov, this), ID_ov); _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove); + + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 0, ID_repeat); } ContentMenu::~ContentMenu () @@ -93,6 +102,12 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _film = film; _content = c; _views = v; + + int const N = _cpl_menu->GetMenuItemCount(); + for (int i = 0; i < N; ++i) { + _cpl_menu->Delete (i); + } + _repeat->Enable (!_content.empty ()); int n = 0; @@ -110,12 +125,33 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList if (_content.size() == 1) { shared_ptr dcp = dynamic_pointer_cast (_content.front ()); - _kdm->Enable (dcp && dcp->encrypted ()); + if (dcp) { + _kdm->Enable (dcp->encrypted ()); + DCPExaminer ex (dcp); + list > cpls = ex.cpls (); + _choose_cpl->Enable (cpls.size() > 1); + int id = 0; + BOOST_FOREACH (shared_ptr i, cpls) { + wxMenuItem* item = _cpl_menu->AppendCheckItem ( + id++, + wxString::Format ( + "%s (%s)", + std_to_wx(i->annotation_text()).data(), + std_to_wx(i->id()).data() + ) + ); + item->Check (dcp->cpl() && dcp->cpl() == i->id()); + } + } else { + _kdm->Enable (false); + _choose_cpl->Enable (false); + } } else { _kdm->Enable (false); } _remove->Enable (!_content.empty ()); + _parent->PopupMenu (_menu, p); } @@ -367,3 +403,25 @@ ContentMenu::properties () d->ShowModal (); d->Destroy (); } + +void +ContentMenu::cpl_selected (wxCommandEvent& ev) +{ + DCPOMATIC_ASSERT (!_content.empty ()); + shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + DCPOMATIC_ASSERT (dcp); + + DCPExaminer ex (dcp); + list > cpls = ex.cpls (); + DCPOMATIC_ASSERT (ev.GetId() < int (cpls.size())); + + list >::const_iterator i = cpls.begin (); + for (int j = 0; j < ev.GetId(); ++j) { + ++i; + } + + dcp->set_cpl ((*i)->id ()); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + film->examine_content (dcp); +} diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 9aaf9d59f..43480888a 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -48,8 +48,10 @@ private: void ov (); void remove (); void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::weak_ptr); + void cpl_selected (wxCommandEvent& ev); wxMenu* _menu; + wxMenu* _cpl_menu; /** Film that we are working with; set up by popup() */ boost::weak_ptr _film; wxWindow* _parent; @@ -62,6 +64,7 @@ private: wxMenuItem* _re_examine; wxMenuItem* _kdm; wxMenuItem* _ov; + wxMenuItem* _choose_cpl; wxMenuItem* _remove; boost::signals2::scoped_connection _job_connection; -- 2.30.2