X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=15a2341848656220acd9f6dc92fbb8c1a8298797;hb=6154d5f85664a26e9490c9120bef5e742af94490;hp=6183e344470fc496871746c80a8aa83d84891808;hpb=f0d7baf0ce956fe5461caa91868c41d881b5f0dc;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 6183e3444..15a234184 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -21,37 +21,48 @@ #include #include "lib/playlist.h" #include "lib/film.h" -#include "lib/moving_image_content.h" +#include "lib/image_content.h" #include "lib/content_factory.h" #include "lib/examine_content_job.h" #include "lib/job_manager.h" +#include "lib/exceptions.h" +#include "lib/dcp_content.h" #include "content_menu.h" #include "repeat_dialog.h" #include "wx_util.h" using std::cout; +using std::vector; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; enum { ID_repeat = 1, + ID_join, ID_find_missing, + ID_re_examine, + ID_kdm, ID_remove }; -ContentMenu::ContentMenu (shared_ptr f, wxWindow* p) +ContentMenu::ContentMenu (wxWindow* p) : _menu (new wxMenu) - , _film (f) , _parent (p) { _repeat = _menu->Append (ID_repeat, _("Repeat...")); + _join = _menu->Append (ID_join, _("Join")); _find_missing = _menu->Append (ID_find_missing, _("Find missing...")); + _re_examine = _menu->Append (ID_re_examine, _("Re-examine...")); + _kdm = _menu->Append (ID_kdm, _("Add KDM...")); _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::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); } @@ -61,11 +72,31 @@ ContentMenu::~ContentMenu () } void -ContentMenu::popup (ContentList c, wxPoint p) +ContentMenu::popup (weak_ptr f, ContentList c, wxPoint p) { + _film = f; _content = c; _repeat->Enable (!_content.empty ()); - _find_missing->Enable (_content.size() == 1 && !_content.front()->path_valid ()); + + int n = 0; + for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { + if (dynamic_pointer_cast (*i)) { + ++n; + } + } + + _join->Enable (n > 1); + + _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ()); + _re_examine->Enable (!_content.empty ()); + + if (_content.size() == 1) { + shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + _kdm->Enable (dcp && dcp->encrypted ()); + } else { + _kdm->Enable (false); + } + _remove->Enable (!_content.empty ()); _parent->PopupMenu (_menu, p); } @@ -94,6 +125,35 @@ ContentMenu::repeat () _content.clear (); } +void +ContentMenu::join () +{ + vector > fc; + for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { + shared_ptr f = dynamic_pointer_cast (*i); + if (f) { + fc.push_back (f); + } + } + + DCPOMATIC_ASSERT (fc.size() > 1); + + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + try { + shared_ptr joined (new FFmpegContent (film, fc)); + for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { + film->remove_content (*i); + } + film->add_content (joined); + } catch (JoinError& e) { + error_dialog (_parent, std_to_wx (e.what ())); + } +} + void ContentMenu::remove () { @@ -126,11 +186,12 @@ ContentMenu::find_missing () shared_ptr content; /* XXX: a bit nasty */ - if (dynamic_pointer_cast (_content.front ())) { + shared_ptr ic = dynamic_pointer_cast (_content.front ()); + if (ic && !ic->still ()) { wxDirDialog* d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); int const r = d->ShowModal (); if (r == wxID_OK) { - content.reset (new MovingImageContent (film, boost::filesystem::path (wx_to_std (d->GetPath ())))); + content.reset (new ImageContent (film, boost::filesystem::path (wx_to_std (d->GetPath ())))); } d->Destroy (); } else { @@ -146,7 +207,7 @@ ContentMenu::find_missing () return; } - shared_ptr j (new ExamineContentJob (film, content)); + shared_ptr j (new ExamineContentJob (film, content, true)); j->Finished.connect ( bind ( @@ -161,6 +222,19 @@ ContentMenu::find_missing () JobManager::instance()->add (j); } +void +ContentMenu::re_examine () +{ + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { + film->examine_content (*i, true); + } +} + void ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_ptr nc) { @@ -171,13 +245,32 @@ ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_pt shared_ptr old_content = oc.lock (); shared_ptr new_content = nc.lock (); - assert (old_content); - assert (new_content); + DCPOMATIC_ASSERT (old_content); + DCPOMATIC_ASSERT (new_content); if (new_content->digest() != old_content->digest()) { error_dialog (0, _("The content file(s) you specified are not the same as those that are missing. Either try again with the correct content file or remove the missing content.")); return; } - old_content->set_path (new_content->path ()); + old_content->set_path (new_content->path (0)); +} + +void +ContentMenu::kdm () +{ + DCPOMATIC_ASSERT (!_content.empty ()); + shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + DCPOMATIC_ASSERT (dcp); + + wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM")); + + if (d->ShowModal() == wxID_OK) { + dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ())))); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + film->examine_content (dcp, true); + } + + d->Destroy (); }