X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=8b41c7039943895d0aa0ad98a44a0e3214f30341;hb=0ac8235fa4addb021c0e05a9c6c19a7d22097458;hp=c643602bdca548828e4719145119092d1ded8ccc;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index c643602bd..8b41c7039 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,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 @@ -40,17 +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 }; @@ -63,7 +71,11 @@ ContentMenu::ContentMenu (wxWindow* p) _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")); @@ -73,7 +85,10 @@ ContentMenu::ContentMenu (wxWindow* p) _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::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 () @@ -87,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; @@ -104,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); } @@ -158,10 +200,8 @@ ContentMenu::join () try { shared_ptr joined (new FFmpegContent (film, fc)); - BOOST_FOREACH (shared_ptr i, _content) { - film->remove_content (i); - } - film->add_content (joined); + film->remove_content (_content); + film->examine_and_add_content (joined); } catch (JoinError& e) { error_dialog (_parent, std_to_wx (e.what ())); } @@ -205,9 +245,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; } } @@ -337,6 +377,25 @@ ContentMenu::kdm () 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); + film->examine_content (dcp); + } + + d->Destroy (); +} + void ContentMenu::properties () { @@ -344,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); +}