X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=c5dc1606d790bb577a0a5ba5382b218febc45867;hp=c643602bdca548828e4719145119092d1ded8ccc;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index c643602bd..c5dc1606d 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -31,7 +32,12 @@ #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 "lib/config.h" +#include +#include #include #include #include @@ -40,45 +46,51 @@ 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 1 to 255 */ + ID_repeat = 256, ID_join, ID_find_missing, ID_properties, ID_re_examine, ID_kdm, + ID_ov, + ID_choose_cpl, ID_remove }; ContentMenu::ContentMenu (wxWindow* p) : _menu (new wxMenu) , _parent (p) + , _pop_up_open (false) { _repeat = _menu->Append (ID_repeat, _("Repeat...")); _join = _menu->Append (ID_join, _("Join")); _find_missing = _menu->Append (ID_find_missing, _("Find missing...")); _properties = _menu->Append (ID_properties, _("Properties...")); _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); _menu->AppendSeparator (); _remove = _menu->Append (ID_remove, _("Remove")); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::repeat, this), ID_repeat); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::join, this), ID_join); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::find_missing, this), ID_find_missing); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::properties, this), ID_properties); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm); - _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove); -} - -ContentMenu::~ContentMenu () -{ - delete _menu; + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::repeat, this), ID_repeat); + _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::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::remove, this), ID_remove); + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1); } void @@ -87,6 +99,12 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _film = film; _content = c; _views = v; + + int const N = _cpl_menu->GetMenuItemCount(); + for (int i = 1; i <= N; ++i) { + _cpl_menu->Delete (i); + } + _repeat->Enable (!_content.empty ()); int n = 0; @@ -104,13 +122,47 @@ 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 ()); + _ov->Enable (dcp->needs_assets ()); + try { + 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->AppendRadioItem ( + 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()); + } + } catch (dcp::DCPReadError &) { + /* 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); + } } else { _kdm->Enable (false); } _remove->Enable (!_content.empty ()); + + _pop_up_open = true; _parent->PopupMenu (_menu, p); + _pop_up_open = false; } void @@ -157,11 +209,9 @@ ContentMenu::join () } try { - shared_ptr joined (new FFmpegContent (film, fc)); - BOOST_FOREACH (shared_ptr i, _content) { - film->remove_content (i); - } - film->add_content (joined); + shared_ptr joined (new FFmpegContent(fc)); + film->remove_content (_content); + film->examine_and_add_content (joined); } catch (JoinError& e) { error_dialog (_parent, std_to_wx (e.what ())); } @@ -205,9 +255,9 @@ ContentMenu::remove () } if (!video && audio) { - AudioMapping m = fc->audio_mapping (); + AudioMapping m = fc->audio->mapping (); m.unmap_all (); - fc->set_audio_mapping (m); + fc->audio->set_mapping (m); handled = true; } } @@ -233,8 +283,6 @@ ContentMenu::find_missing () return; } - shared_ptr content; - /* XXX: a bit nasty */ shared_ptr ic = dynamic_pointer_cast (_content.front ()); shared_ptr dc = dynamic_pointer_cast (_content.front ()); @@ -254,27 +302,35 @@ ContentMenu::find_missing () d->Destroy (); } + list > content; + if (r == wxID_OK) { - content = content_factory (film, path); + if (dc) { + content.push_back (shared_ptr(new DCPContent(path))); + } else { + content = content_factory (path); + } } - if (!content) { + if (content.empty ()) { return; } - shared_ptr j (new ExamineContentJob (film, content)); + BOOST_FOREACH (shared_ptr i, content) { + shared_ptr j (new ExamineContentJob (film, i)); - _job_connection = j->Finished.connect ( - bind ( - &ContentMenu::maybe_found_missing, - this, - boost::weak_ptr (j), - boost::weak_ptr (_content.front ()), - boost::weak_ptr (content) - ) - ); + j->Finished.connect ( + bind ( + &ContentMenu::maybe_found_missing, + this, + boost::weak_ptr (j), + boost::weak_ptr (_content.front ()), + boost::weak_ptr (i) + ) + ); - JobManager::instance()->add (j); + JobManager::instance()->add (j); + } } void @@ -286,7 +342,7 @@ ContentMenu::re_examine () } BOOST_FOREACH (shared_ptr i, _content) { - film->examine_content (i); + JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, i))); } } @@ -308,7 +364,7 @@ ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_pt return; } - old_content->set_path (new_content->path (0)); + old_content->set_paths (new_content->paths()); } void @@ -322,16 +378,35 @@ ContentMenu::kdm () if (d->ShowModal() == wxID_OK) { try { - dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ())))); + dcp->add_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; } shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - film->examine_content (dcp); + JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); + } + + d->Destroy (); +} + +void +ContentMenu::ov () +{ + DCPOMATIC_ASSERT (!_content.empty ()); + shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + DCPOMATIC_ASSERT (dcp); + + wxDirDialog* d = new wxDirDialog (_parent, _("Select OV")); + + if (d->ShowModal() == wxID_OK) { + dcp->add_ov (wx_to_std (d->GetPath ())); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); } d->Destroy (); @@ -340,7 +415,36 @@ ContentMenu::kdm () 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::cpl_selected (wxCommandEvent& ev) +{ + if (!_pop_up_open) { + return; + } + + DCPOMATIC_ASSERT (!_content.empty ()); + shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + DCPOMATIC_ASSERT (dcp); + + DCPExaminer ex (dcp, true); + list > cpls = ex.cpls (); + DCPOMATIC_ASSERT (ev.GetId() > 0); + DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size())); + + list >::const_iterator i = cpls.begin (); + for (int j = 0; j < ev.GetId() - 1; ++j) { + ++i; + } + + dcp->set_cpl ((*i)->id ()); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); +}