#include "lib/dcp_examiner.h"
#include "lib/ffmpeg_content.h"
#include "lib/audio_content.h"
+#include "lib/config.h"
#include <dcp/cpl.h>
#include <dcp/exceptions.h>
#include <wx/wx.h>
_kdm->Enable (dcp->encrypted ());
_ov->Enable (dcp->needs_assets ());
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::DCPReadError &) {
/* The DCP is probably missing */
+ } catch (dcp::KDMDecryptionError &) {
+ /* We have an incorrect KDM */
+ } catch (KDMError &) {
+ /* We have an incorrect KDM */
}
} else {
_kdm->Enable (false);
}
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) {
if (r == wxID_OK) {
if (dc) {
- content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+ content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
} else {
- content = content_factory (film, path);
+ content = content_factory (path);
}
}
try {
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 ();
}
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()));