X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=3d5b002798ee72d6c8cce2d968f0733879a8b0c6;hp=741fc8283b00ad67a1e33ef4bb2c3f060ba9048e;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=7b2054e2a73844450b5b55c5788c02af671812ce diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 741fc8283..3d5b00279 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -1,24 +1,29 @@ /* - Copyright (C) 2013 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 . */ -#include -#include +#include "content_menu.h" +#include "repeat_dialog.h" +#include "wx_util.h" +#include "timeline_video_content_view.h" +#include "timeline_audio_content_view.h" +#include "content_properties_dialog.h" #include "lib/playlist.h" #include "lib/film.h" #include "lib/image_content.h" @@ -27,12 +32,16 @@ #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" +#include "lib/ffmpeg_content.h" +#include "lib/audio_content.h" +#include +#include +#include +#include using std::cout; using std::vector; +using std::exception; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; @@ -41,6 +50,8 @@ enum { ID_repeat = 1, ID_join, ID_find_missing, + ID_properties, + ID_re_examine, ID_kdm, ID_remove }; @@ -52,6 +63,8 @@ ContentMenu::ContentMenu (wxWindow* p) _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...")); _kdm = _menu->Append (ID_kdm, _("Add KDM...")); _menu->AppendSeparator (); _remove = _menu->Append (ID_remove, _("Remove")); @@ -59,6 +72,8 @@ ContentMenu::ContentMenu (wxWindow* p) _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); } @@ -69,22 +84,25 @@ ContentMenu::~ContentMenu () } void -ContentMenu::popup (weak_ptr f, ContentList c, wxPoint p) +ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList v, wxPoint p) { - _film = f; + _film = film; _content = c; + _views = v; _repeat->Enable (!_content.empty ()); int n = 0; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - if (dynamic_pointer_cast (*i)) { + BOOST_FOREACH (shared_ptr i, _content) { + if (dynamic_pointer_cast (i)) { ++n; } } - + _join->Enable (n > 1); - + _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ()); + _properties->Enable (_content.size() == 1); + _re_examine->Enable (!_content.empty ()); if (_content.size() == 1) { shared_ptr dcp = dynamic_pointer_cast (_content.front ()); @@ -92,7 +110,7 @@ ContentMenu::popup (weak_ptr f, ContentList c, wxPoint p) } else { _kdm->Enable (false); } - + _remove->Enable (!_content.empty ()); _parent->PopupMenu (_menu, p); } @@ -103,36 +121,37 @@ ContentMenu::repeat () if (_content.empty ()) { return; } - + RepeatDialog* d = new RepeatDialog (_parent); if (d->ShowModal() != wxID_OK) { d->Destroy (); return; } - shared_ptr film = _film.lock (); + shared_ptr film = _film.lock (); if (!film) { return; } - film->playlist()->repeat (_content, d->number ()); + film->repeat_content (_content, d->number ()); d->Destroy (); _content.clear (); + _views.clear (); } void ContentMenu::join () { vector > fc; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - shared_ptr f = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, _content) { + shared_ptr f = dynamic_pointer_cast (i); if (f) { fc.push_back (f); } } - assert (fc.size() > 1); + DCPOMATIC_ASSERT (fc.size() > 1); shared_ptr film = _film.lock (); if (!film) { @@ -141,8 +160,8 @@ ContentMenu::join () try { shared_ptr joined (new FFmpegContent (film, fc)); - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - film->remove_content (*i); + BOOST_FOREACH (shared_ptr i, _content) { + film->remove_content (i); } film->add_content (joined); } catch (JoinError& e) { @@ -157,14 +176,51 @@ ContentMenu::remove () return; } - shared_ptr film = _film.lock (); + shared_ptr film = _film.lock (); if (!film) { return; } - film->playlist()->remove (_content); + /* We are removing from the timeline if _views is not empty */ + bool handled = false; + if (!_views.empty ()) { + /* Special case: we only remove FFmpegContent if its video view is selected; + if not, and its audio view is selected, we unmap the audio. + */ + BOOST_FOREACH (shared_ptr i, _content) { + shared_ptr fc = dynamic_pointer_cast (i); + if (!fc) { + continue; + } + + shared_ptr video; + shared_ptr audio; + + BOOST_FOREACH (shared_ptr j, _views) { + shared_ptr v = dynamic_pointer_cast (j); + shared_ptr a = dynamic_pointer_cast (j); + if (v && v->content() == fc) { + video = v; + } else if (a && a->content() == fc) { + audio = a; + } + } + + if (!video && audio) { + AudioMapping m = fc->audio->mapping (); + m.unmap_all (); + fc->audio->set_mapping (m); + handled = true; + } + } + } + + if (!handled) { + film->remove_content (_content); + } _content.clear (); + _views.clear (); } void @@ -178,34 +234,39 @@ ContentMenu::find_missing () if (!film) { return; } - + shared_ptr content; /* XXX: a bit nasty */ shared_ptr ic = dynamic_pointer_cast (_content.front ()); - if (ic && !ic->still ()) { + shared_ptr dc = dynamic_pointer_cast (_content.front ()); + + int r = wxID_CANCEL; + boost::filesystem::path path; + + if ((ic && !ic->still ()) || dc) { 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 ImageContent (film, boost::filesystem::path (wx_to_std (d->GetPath ())))); - } + r = d->ShowModal (); + path = wx_to_std (d->GetPath ()); d->Destroy (); } else { wxFileDialog* d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE); - int const r = d->ShowModal (); - if (r == wxID_OK) { - content = content_factory (film, wx_to_std (d->GetPath ())); - } + r = d->ShowModal (); + path = wx_to_std (d->GetPath ()); d->Destroy (); } + if (r == wxID_OK) { + content = content_factory (film, path); + } + if (!content) { return; } shared_ptr j (new ExamineContentJob (film, content)); - - j->Finished.connect ( + + _job_connection = j->Finished.connect ( bind ( &ContentMenu::maybe_found_missing, this, @@ -214,10 +275,23 @@ ContentMenu::find_missing () boost::weak_ptr (content) ) ); - + JobManager::instance()->add (j); } +void +ContentMenu::re_examine () +{ + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + BOOST_FOREACH (shared_ptr i, _content) { + film->examine_content (i); + } +} + void ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_ptr nc) { @@ -228,8 +302,8 @@ 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.")); @@ -242,18 +316,33 @@ ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_pt void ContentMenu::kdm () { - assert (!_content.empty ()); + DCPOMATIC_ASSERT (!_content.empty ()); shared_ptr dcp = dynamic_pointer_cast (_content.front ()); - assert (dcp); - + 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 ())))); + try { + dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ())))); + } catch (exception& e) { + error_dialog (_parent, wxString::Format (_("Could not load KDM (%s)"), e.what ())); + d->Destroy (); + return; + } + shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); film->examine_content (dcp); } - + + d->Destroy (); +} + +void +ContentMenu::properties () +{ + ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ()); + d->ShowModal (); d->Destroy (); }