#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 <wx/wx.h>
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"));
_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_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);
}
-ContentMenu::~ContentMenu ()
-{
- delete _menu;
-
- BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
- i.disconnect ();
- }
-}
-
void
ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList v, wxPoint p)
{
if (dcp) {
_kdm->Enable (dcp->encrypted ());
_ov->Enable (dcp->needs_assets ());
+ _set_dcp_settings->Enable (static_cast<bool>(dcp));
try {
- DCPExaminer ex (dcp);
+ 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;
BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
- wxMenuItem* item = _cpl_menu->AppendCheckItem (
+ wxMenuItem* item = _cpl_menu->AppendRadioItem (
id++,
wxString::Format (
"%s (%s)",
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
- } catch (dcp::DCPReadError) {
+ } 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 ()
{
}
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) {
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));
+ BOOST_FOREACH (shared_ptr<Content> 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)
+ boost::weak_ptr<Content> (i)
)
- )
- );
+ );
- JobManager::instance()->add (j);
+ JobManager::instance()->add (j);
+ }
}
void
return;
}
- old_content->set_path (new_content->path (0));
+ old_content->set_paths (new_content->paths());
}
void
if (d->ShowModal() == wxID_OK) {
try {
- dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+ dcp->add_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;
}
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::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() > 0);
DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));
projects / dcpomatic.git / blobdiff