/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "timeline_video_content_view.h"
#include "timeline_audio_content_view.h"
#include "content_properties_dialog.h"
+#include "content_advanced_dialog.h"
#include "lib/playlist.h"
#include "lib/film.h"
#include "lib/image_content.h"
#include "lib/dcp_examiner.h"
#include "lib/ffmpeg_content.h"
#include "lib/audio_content.h"
+#include "lib/config.h"
+#include "lib/copy_dcp_details_to_film.h"
#include <dcp/cpl.h>
+#include <dcp/exceptions.h>
+#include <dcp/decrypted_kdm.h>
#include <wx/wx.h>
#include <wx/dirdlg.h>
-#include <boost/foreach.hpp>
#include <iostream>
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;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
enum {
- /* Start at 256 so we can have IDs on _cpl_menu from 0 to 255 */
+ /* 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_advanced,
ID_re_examine,
ID_kdm,
ID_ov,
ID_choose_cpl,
+ ID_set_dcp_settings,
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..."));
+ _advanced = _menu->Append (ID_advanced, _("Advanced settings..."));
_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);
+ _set_dcp_settings = _menu->Append (ID_set_dcp_settings, _("Set project DCP settings from this DCP"));
_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::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 - 1);
-}
-
-ContentMenu::~ContentMenu ()
-{
- delete _menu;
-
- BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
- i.disconnect ();
- }
+ _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::advanced, this), ID_advanced);
+ _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::set_dcp_settings, this), ID_set_dcp_settings);
+ _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
_views = v;
int const N = _cpl_menu->GetMenuItemCount();
- for (int i = 0; i < N; ++i) {
+ for (int i = 1; i <= N; ++i) {
_cpl_menu->Delete (i);
}
_repeat->Enable (!_content.empty ());
int n = 0;
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ for (auto i: _content) {
if (dynamic_pointer_cast<FFmpegContent> (i)) {
++n;
}
_find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
_properties->Enable (_content.size() == 1);
+ _advanced->Enable (_content.size() == 1);
_re_examine->Enable (!_content.empty ());
if (_content.size() == 1) {
if (dcp) {
_kdm->Enable (dcp->encrypted ());
_ov->Enable (dcp->needs_assets ());
- DCPExaminer ex (dcp);
- list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
- _choose_cpl->Enable (cpls.size() > 1);
- int id = 0;
- BOOST_FOREACH (shared_ptr<dcp::CPL> 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());
+ _set_dcp_settings->Enable (static_cast<bool>(dcp));
+ try {
+ DCPExaminer ex (dcp, true);
+ list<shared_ptr<dcp::CPL> > 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;
+ for (auto 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::ReadError &) {
+ /* 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);
+ _set_dcp_settings->Enable (false);
}
} else {
_kdm->Enable (false);
+ _set_dcp_settings->Enable (false);
}
_remove->Enable (!_content.empty ());
+ _pop_up_open = true;
_parent->PopupMenu (_menu, p);
+ _pop_up_open = false;
+}
+
+
+void
+ContentMenu::set_dcp_settings ()
+{
+ shared_ptr<Film> film = _film.lock ();
+ if (!film) {
+ return;
+ }
+
+ DCPOMATIC_ASSERT (_content.size() == 1);
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_content.front());
+ DCPOMATIC_ASSERT (dcp);
+ copy_dcp_details_to_film (dcp, film);
}
+
void
ContentMenu::repeat ()
{
ContentMenu::join ()
{
vector<shared_ptr<Content> > fc;
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ for (auto i: _content) {
shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (i);
if (f) {
fc.push_back (f);
}
try {
- shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+ shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
film->remove_content (_content);
film->examine_and_add_content (joined);
} catch (JoinError& e) {
/* 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<Content> i, _content) {
+ for (auto i: _content) {
shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (i);
if (!fc) {
continue;
shared_ptr<TimelineVideoContentView> video;
shared_ptr<TimelineAudioContentView> audio;
- BOOST_FOREACH (shared_ptr<TimelineContentView> j, _views) {
+ for (auto j: _views) {
shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (j);
shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (j);
if (v && v->content() == fc) {
return;
}
- shared_ptr<Content> content;
-
/* XXX: a bit nasty */
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ());
shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (_content.front ());
d->Destroy ();
}
+ list<shared_ptr<Content> > content;
+
if (r == wxID_OK) {
- content = content_factory (film, path);
+ if (dc) {
+ content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
+ } else {
+ content = content_factory (path);
+ }
}
- if (!content) {
+ if (content.empty ()) {
return;
}
- shared_ptr<Job> j (new ExamineContentJob (film, content));
+ for (auto i: content) {
+ shared_ptr<Job> j (new ExamineContentJob (film, i));
- _job_connections.push_back (
j->Finished.connect (
bind (
&ContentMenu::maybe_found_missing,
this,
- boost::weak_ptr<Job> (j),
- boost::weak_ptr<Content> (_content.front ()),
- boost::weak_ptr<Content> (content)
+ std::weak_ptr<Job> (j),
+ std::weak_ptr<Content> (_content.front ()),
+ std::weak_ptr<Content> (i)
)
- )
- );
+ );
- JobManager::instance()->add (j);
+ JobManager::instance()->add (j);
+ }
}
void
return;
}
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ for (auto i: _content) {
JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, i)));
}
}
return;
}
- old_content->set_path (new_content->path (0));
+ old_content->set_paths (new_content->paths());
}
void
wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
if (d->ShowModal() == wxID_OK) {
+ optional<dcp::EncryptedKDM> kdm;
try {
- dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+ 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;
}
+ /* Try to decrypt it to get an early preview of any errors */
+ try {
+ decrypt_kdm_with_helpful_error (*kdm);
+ } catch (KDMError& e) {
+ error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail()));
+ return;
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ return;
+ }
+
+ DCPExaminer ex (dcp, true);
+
+ bool kdm_matches_any_cpl = false;
+ for (auto i: ex.cpls()) {
+ if (i->id() == kdm->cpl_id()) {
+ kdm_matches_any_cpl = true;
+ }
+ }
+
+ bool kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get();
+
+ if (!kdm_matches_any_cpl) {
+ error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one."));
+ return;
+ }
+
+ if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) {
+ message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one. To play the currently-selected CPL you will need a different KDM."));
+ }
+
+ dcp->add_kdm (*kdm);
+
shared_ptr<Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
void
ContentMenu::properties ()
{
- ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+ shared_ptr<Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
d->ShowModal ();
d->Destroy ();
}
+
+void
+ContentMenu::advanced ()
+{
+ ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front());
+ d->ShowModal ();
+ d->Destroy ();
+}
+
+
void
ContentMenu::cpl_selected (wxCommandEvent& ev)
{
+ if (!_pop_up_open) {
+ return;
+ }
+
DCPOMATIC_ASSERT (!_content.empty ());
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
DCPOMATIC_ASSERT (dcp);
- DCPExaminer ex (dcp);
+ DCPExaminer ex (dcp, true);
list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
- DCPOMATIC_ASSERT (ev.GetId() < int (cpls.size()));
+ DCPOMATIC_ASSERT (ev.GetId() > 0);
+ DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));
list<shared_ptr<dcp::CPL> >::const_iterator i = cpls.begin ();
- for (int j = 0; j < ev.GetId(); ++j) {
+ for (int j = 0; j < ev.GetId() - 1; ++j) {
++i;
}
projects / dcpomatic.git / blobdiff