X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=0adbc775a9134810e9db50ec4b1b4cb9f08a96f7;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=6a8e5cd4a76a3fa08c4e98f81857bd2794041c55;hpb=ef4cd174472dc1c4694d4451dc60b9292c60666b;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 6a8e5cd4a..0adbc775a 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,41 +17,58 @@ */ -#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" #include "lib/content_factory.h" #include "lib/examine_content_job.h" #include "lib/job_manager.h" -#include "content_menu.h" -#include "repeat_dialog.h" -#include "wx_util.h" +#include "lib/exceptions.h" +#include "lib/dcp_content.h" +#include +#include 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_properties, + 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...")); + _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")); _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); } @@ -61,11 +78,33 @@ ContentMenu::~ContentMenu () } void -ContentMenu::popup (ContentList c, wxPoint p) +ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList v, wxPoint p) { + _film = film; _content = c; + _views = v; _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 ()); + _properties->Enable (_content.size() == 1); + _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); } @@ -76,22 +115,52 @@ 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); + 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 @@ -101,14 +170,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. + */ + for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { + shared_ptr fc = dynamic_pointer_cast (*i); + if (!fc) { + continue; + } + + shared_ptr video; + shared_ptr audio; + + for (TimelineContentViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr v = dynamic_pointer_cast (*i); + shared_ptr a = dynamic_pointer_cast (*i); + 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->set_audio_mapping (m); + handled = true; + } + } + } + + if (!handled) { + film->remove_content (_content); + } _content.clear (); + _views.clear (); } void @@ -122,7 +228,7 @@ ContentMenu::find_missing () if (!film) { return; } - + shared_ptr content; /* XXX: a bit nasty */ @@ -148,8 +254,8 @@ ContentMenu::find_missing () } shared_ptr j (new ExamineContentJob (film, content)); - - j->Finished.connect ( + + _job_connection = j->Finished.connect ( bind ( &ContentMenu::maybe_found_missing, this, @@ -158,10 +264,23 @@ ContentMenu::find_missing () boost::weak_ptr (content) ) ); - + 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); + } +} + void ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_ptr nc) { @@ -172,13 +291,40 @@ 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); + } + + d->Destroy (); +} + +void +ContentMenu::properties () +{ + ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ()); + d->ShowModal (); + d->Destroy (); }