/*
- Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "wx/full_config_dialog.h"
+
#include "wx/about_dialog.h"
-#include "wx/report_problem_dialog.h"
+#include "wx/dcpomatic_button.h"
+#include "wx/editable_list.h"
#include "wx/file_picker_ctrl.h"
-#include "wx/wx_util.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/screens_panel.h"
-#include "wx/kdm_timing_panel.h"
-#include "wx/kdm_output_panel.h"
+#include "wx/full_config_dialog.h"
#include "wx/job_view_dialog.h"
-#include "wx/file_dialog_wrapper.h"
+#include "wx/kdm_output_panel.h"
+#include "wx/kdm_timing_panel.h"
+#include "wx/nag_dialog.h"
#include "wx/new_dkdm_folder_dialog.h"
-#include "wx/editable_list.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/screens_panel.h"
#include "wx/static_text.h"
-#include "wx/dcpomatic_button.h"
-#include "wx/nag_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
+#include "lib/cinema.h"
+#include "lib/compose.hpp"
#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/screen.h"
-#include "lib/job_manager.h"
-#include "lib/screen_kdm.h"
+#include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/dkdm_wrapper.h"
#include "lib/exceptions.h"
-#include "lib/cinema_kdms.h"
+#include "lib/file_log.h"
+#include "lib/job_manager.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/screen.h"
#include "lib/send_kdm_email_job.h"
-#include "lib/compose.hpp"
-#include "lib/cinema.h"
-#include "lib/dkdm_wrapper.h"
-#include "lib/cross.h"
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "lib/decrypted_ecinema_kdm.h"
-#endif
+#include "lib/util.h"
#include <dcp/encrypted_kdm.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/exceptions.h>
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/splash.h>
-#include <wx/filepicker.h>
+#include <wx/treectrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#ifdef __WXOSX__
#include <ApplicationServices/ApplicationServices.h>
#endif
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+#include <boost/bind/bind.hpp>
#ifdef check
#undef check
#endif
+
using std::exception;
using std::list;
+using std::make_shared;
+using std::map;
+using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
-using std::pair;
-using std::map;
-using boost::shared_ptr;
using boost::bind;
using boost::optional;
using boost::ref;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
+
enum {
ID_help_report_a_problem = 1,
};
+
class DOMFrame : public wxFrame
{
public:
explicit DOMFrame (wxString const & title)
- : wxFrame (0, -1, title)
- , _config_dialog (0)
- , _job_view (0)
+ : wxFrame (nullptr, -1, title)
+ , _config_dialog (nullptr)
+ , _job_view (nullptr)
{
#if defined(DCPOMATIC_WINDOWS)
if (Config::instance()->win32_console ()) {
}
#endif
- wxMenuBar* bar = new wxMenuBar;
+ auto bar = new wxMenuBar;
setup_menu (bar);
SetMenuBar (bar);
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
*/
- wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
- wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
+ auto overall_panel = new wxPanel (this, wxID_ANY);
+ auto main_sizer = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
- wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
+ auto horizontal = new wxBoxSizer (wxHORIZONTAL);
+ auto left = new wxBoxSizer (wxVERTICAL);
+ auto right = new wxBoxSizer (wxVERTICAL);
horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 2);
horizontal->Add (right, 1, wxEXPAND);
wxFont subheading_font (*wxNORMAL_FONT);
subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
- wxStaticText* h = new StaticText (overall_panel, _("Screens"));
+ auto h = new StaticText (overall_panel, _("Screens"));
h->SetFont (subheading_font);
- left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
_screens = new ScreensPanel (overall_panel);
left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
h = new StaticText (overall_panel, S_("KDM|Timing"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+ right->Add (h);
_timing = new KDMTimingPanel (overall_panel);
right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
h = new StaticText (overall_panel, _("DKDM"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
- wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
+ right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+ auto dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
_dkdm = new wxTreeCtrl (
overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
);
h = new StaticText (overall_panel, _("Output"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
- /* XXX: hard-coded non-interop here */
- _output = new KDMOutputPanel (overall_panel, false);
+ right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+ _output = new KDMOutputPanel (overall_panel);
right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
_create = new Button (overall_panel, _("Create KDMs"));
_export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this));
setup_sensitivity ();
+
+ dcpomatic_log = make_shared<FileLog>(State::write_path("kdm.log"));
}
private:
void help_about ()
{
- AboutDialog* d = new AboutDialog (this);
+ auto d = new AboutDialog (this);
d->ShowModal ();
d->Destroy ();
}
void help_report_a_problem ()
{
- ReportProblemDialog* d = new ReportProblemDialog (this, shared_ptr<Film> ());
+ auto d = new ReportProblemDialog (this, shared_ptr<Film>());
if (d->ShowModal () == wxID_OK) {
d->report ();
}
void setup_menu (wxMenuBar* m)
{
- wxMenu* file = new wxMenu;
+ auto file = new wxMenu;
#ifdef __WXOSX__
file->Append (wxID_EXIT, _("&Exit"));
*id = selections[0];
}
- DKDMMap::const_iterator i = _dkdm_id.find (selections[0]);
+ auto i = _dkdm_id.find (selections[0]);
if (i == _dkdm_id.end()) {
return shared_ptr<DKDMBase> ();
}
void create_kdms ()
{
try {
- shared_ptr<DKDMBase> dkdm_base = selected_dkdm ();
+ auto dkdm_base = selected_dkdm ();
if (!dkdm_base) {
return;
}
- list<shared_ptr<ScreenKDM> > screen_kdms;
+ list<KDMWithMetadataPtr> kdms;
string title;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- shared_ptr<ECinemaDKDM> ecinema_dkdm = boost::dynamic_pointer_cast<ECinemaDKDM> (dkdm_base);
- if (ecinema_dkdm) {
- DecryptedECinemaKDM decrypted (ecinema_dkdm->dkdm(), Config::instance()->decryption_chain()->key().get());
- title = decrypted.name ();
-
- BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
-
- if (!i->recipient) {
- continue;
- }
-
- DecryptedECinemaKDM kdm (decrypted.id(), decrypted.name(), decrypted.key());
-
- /* Encrypt */
- screen_kdms.push_back (
- shared_ptr<ScreenKDM>(
- new ECinemaScreenKDM(i, kdm.encrypt(i->recipient.get()))
- )
- );
- }
- }
-#endif
-
- shared_ptr<DKDM> dkdm = boost::dynamic_pointer_cast<DKDM> (dkdm_base);
+ auto dkdm = std::dynamic_pointer_cast<DKDM>(dkdm_base);
if (dkdm) {
/* Decrypt the DKDM */
title = decrypted.content_title_text ();
/* This is the signer for our new KDMs */
- shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
+ auto signer = Config::instance()->signer_chain ();
if (!signer->valid ()) {
throw InvalidSignerError ();
}
- BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
+ for (auto i: _screens->screens()) {
if (!i->recipient) {
continue;
}
+ dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+ dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
/* Make an empty KDM */
dcp::DecryptedKDM kdm (
- dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+ begin,
+ end,
decrypted.annotation_text().get_value_or (""),
- decrypted.content_title_text(),
+ title,
dcp::LocalTime().as_string()
);
/* Add keys from the DKDM */
- BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) {
+ for (auto const& j: decrypted.keys()) {
kdm.add_key (j);
}
+ auto const encrypted = kdm.encrypt(
+ signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
+ !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
+ );
+
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+ name_values['f'] = title;
+ name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+ name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+ name_values['i'] = encrypted.cpl_id ();
+
/* Encrypt */
- screen_kdms.push_back (
- shared_ptr<ScreenKDM>(
- new DCPScreenKDM(
- i,
- kdm.encrypt(
- signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
- !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
- )
- )
- )
- );
+ kdms.push_back (make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema->emails, encrypted));
}
}
- if (screen_kdms.empty()) {
+ if (kdms.empty()) {
return;
}
- pair<shared_ptr<Job>, int> result = _output->make (
- screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
+ auto result = _output->make (
+ kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1)
);
if (result.first) {
_output->setup_sensitivity ();
wxArrayTreeItemIds sel;
_dkdm->GetSelections (sel);
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
- shared_ptr<DKDM> dkdm = dynamic_pointer_cast<DKDM>(selected_dkdm());
- _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0);
+ auto group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
+ auto dkdm = dynamic_pointer_cast<DKDM>(selected_dkdm());
+ _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0 && dkdm);
_remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root"));
_export_dkdm->Enable (sel.GetCount() > 0 && dkdm);
}
void dkdm_end_drag (wxTreeEvent& ev)
{
- DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ());
- DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ());
+ auto from = _dkdm_id.find (_dkdm->GetSelection ());
+ auto to = _dkdm_id.find (ev.GetItem ());
if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) {
return;
}
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (to->second);
+ auto group = dynamic_pointer_cast<DKDMGroup> (to->second);
if (!group) {
group = to->second->parent();
}
void add_dkdm_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file"));
+ auto d = new wxFileDialog (this, _("Select DKDM file"));
if (d->ShowModal() == wxID_OK) {
- shared_ptr<const dcp::CertificateChain> chain = Config::instance()->decryption_chain();
+ auto chain = Config::instance()->decryption_chain();
DCPOMATIC_ASSERT (chain->key());
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- try {
- cxml::Document test_doc;
- string const xml_string = dcp::file_to_string (wx_to_std(d->GetPath()), MAX_KDM_SIZE);
- test_doc.read_string (xml_string);
- if (test_doc.root_name() == "ECinemaSecurityMessage") {
- EncryptedECinemaKDM ekdm(xml_string);
- /* Decrypt the DKDM to make sure that we can */
- DecryptedECinemaKDM dkdm(ekdm, chain->key().get());
-
- shared_ptr<DKDMBase> new_dkdm(new ECinemaDKDM(ekdm));
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
- if (!group) {
- group = Config::instance()->dkdms();
- }
- add_dkdm_model (new_dkdm, group);
- add_dkdm_view (new_dkdm);
- d->Destroy ();
- return;
- }
- } catch (KDMError& e) {
- error_dialog (
- this, "Could not read file as a KDM. Perhaps it is badly formatted, created with the wrong certificate, or not a KDM at all.",
- std_to_wx(e.what())
- );
- d->Destroy ();
- return;
- } catch (dcp::MiscError& e) {
- error_dialog (
- this,
- _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."),
- std_to_wx(e.what())
- );
- d->Destroy ();
- return;
- }
-#endif
-
try {
dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE));
/* Decrypt the DKDM to make sure that we can */
dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
- shared_ptr<DKDMBase> new_dkdm(new DKDM(ekdm));
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm ());
+ auto new_dkdm = make_shared<DKDM>(ekdm);
+ auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
if (!group) {
group = Config::instance()->dkdms ();
}
void add_dkdm_folder_clicked ()
{
- NewDKDMFolderDialog* d = new NewDKDMFolderDialog (this);
+ auto d = new NewDKDMFolderDialog (this);
if (d->ShowModal() == wxID_OK) {
- shared_ptr<DKDMBase> new_dkdm (new DKDMGroup (wx_to_std (d->get ())));
- shared_ptr<DKDMGroup> parent = dynamic_pointer_cast<DKDMGroup> (selected_dkdm ());
+ auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(d->get()));
+ auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
if (!parent) {
parent = Config::instance()->dkdms ();
}
}
/* Add children */
- shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (base);
+ auto g = dynamic_pointer_cast<DKDMGroup>(base);
if (g) {
- BOOST_FOREACH (shared_ptr<DKDMBase> i, g->children()) {
+ for (auto i: g->children()) {
add_dkdm_view (i);
}
}
wxTreeItemId dkdm_to_id (shared_ptr<DKDMBase> dkdm)
{
- for (DKDMMap::iterator i = _dkdm_id.begin(); i != _dkdm_id.end(); ++i) {
- if (i->second == dkdm) {
- return i->first;
+ for (auto const& i: _dkdm_id) {
+ if (i.second == dkdm) {
+ return i.first;
}
}
DCPOMATIC_ASSERT (false);
void remove_dkdm_clicked ()
{
- shared_ptr<DKDMBase> removed = selected_dkdm ();
+ auto removed = selected_dkdm ();
if (!removed) {
return;
}
}
_dkdm->Delete (dkdm_to_id (removed));
- shared_ptr<DKDMGroup> dkdms = Config::instance()->dkdms ();
+ auto dkdms = Config::instance()->dkdms ();
dkdms->remove (removed);
Config::instance()->changed ();
}
void export_dkdm_clicked ()
{
- shared_ptr<DKDMBase> removed = selected_dkdm ();
+ auto removed = selected_dkdm ();
if (!removed) {
return;
}
- shared_ptr<DKDM> dkdm = dynamic_pointer_cast<DKDM>(removed);
+ auto dkdm = dynamic_pointer_cast<DKDM>(removed);
if (!dkdm) {
return;
}
- wxFileDialog* d = new wxFileDialog (
+ auto d = new wxFileDialog (
this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT
);
ScreensPanel* _screens;
KDMTimingPanel* _timing;
wxTreeCtrl* _dkdm;
- typedef std::map<wxTreeItemId, boost::shared_ptr<DKDMBase> > DKDMMap;
+ typedef std::map<wxTreeItemId, std::shared_ptr<DKDMBase>> DKDMMap;
DKDMMap _dkdm_id;
wxButton* _add_dkdm;
wxButton* _add_dkdm_folder;
JobViewDialog* _job_view;
};
+
/** @class App
* @brief The magic App class for wxWidgets.
*/
public:
App ()
: wxApp ()
- , _frame (0)
+ , _frame (nullptr)
{}
private:
- bool OnInit ()
+ bool OnInit () override
{
- wxSplashScreen* splash = 0;
+ wxSplashScreen* splash = nullptr;
try {
wxInitAllImageHandlers ();
unsetenv ("UBUNTU_MENUPROXY");
#endif
-#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+ make_foreground_application ();
#endif
dcpomatic_setup_path_encoding ();
_frame->Maximize ();
if (splash) {
splash->Destroy ();
- splash = 0;
+ splash = nullptr;
}
_frame->Show ();
}
/* An unhandled exception has occurred inside the main event loop */
- bool OnExceptionInMainLoop ()
+ bool OnExceptionInMainLoop () override
{
try {
throw;
);
} catch (exception& e) {
error_dialog (
- 0,
+ nullptr,
wxString::Format (
_("An exception occurred: %s.\n\n") + " " + REPORT_PROBLEM,
- std_to_wx (e.what ())
+ std_to_wx(e.what())
)
);
} catch (...) {
return false;
}
- void OnUnhandledException ()
+ void OnUnhandledException () override
{
- error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
+ error_dialog (nullptr, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
}
void idle ()
void config_warning (string m)
{
- message_dialog (_frame, std_to_wx (m));
+ message_dialog (_frame, std_to_wx(m));
}
DOMFrame* _frame;
projects / dcpomatic.git / blobdiff