add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_output = new DirPickerCtrl (overall_panel);
output->Add (_output, 1, wxEXPAND);
_combine = new Button (overall_panel, _("Combine"));
add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_output = new DirPickerCtrl (overall_panel);
output->Add (_output, 1, wxEXPAND);
_combine = new Button (overall_panel, _("Combine"));
sizer->Add (_input, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
sizer->Add (output, 0, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
sizer->Add (_combine, 0, wxALL | wxALIGN_RIGHT, DCPOMATIC_DIALOG_BORDER);
sizer->Add (_input, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
sizer->Add (output, 0, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
sizer->Add (_combine, 0, wxALL | wxALIGN_RIGHT, DCPOMATIC_DIALOG_BORDER);
error_dialog (
this,
String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string())
error_dialog (
this,
String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string())
- JobManager* jm = JobManager::instance ();
- jm->add (shared_ptr<Job>(new CombineDCPJob(_inputs, output)));
+ auto jm = JobManager::instance ();
+ jm->add (make_shared<CombineDCPJob>(_inputs, output));
bool const ok = display_progress (_("DCP-o-matic Combine"), _("Combining DCPs"));
if (!ok) {
return;
}
DCPOMATIC_ASSERT (!jm->get().empty());
bool const ok = display_progress (_("DCP-o-matic Combine"), _("Combining DCPs"));
if (!ok) {
return;
}
DCPOMATIC_ASSERT (!jm->get().empty());
DCPOMATIC_ASSERT (last);
if (last->finished_ok()) {
message_dialog (this, _("DCPs combined successfully."));
} else {
DCPOMATIC_ASSERT (last);
if (last->finished_ok()) {
message_dialog (this, _("DCPs combined successfully."));
} else {
if (!last->error_details().empty()) {
m += wxString::Format(" (%s)", std_to_wx(last->error_details()));
}
if (!last->error_details().empty()) {
m += wxString::Format(" (%s)", std_to_wx(last->error_details()));
}
- error_dialog (0, wxString::Format ("DCP-o-matic DCP Combiner could not start."), std_to_wx(e.what()));
+ error_dialog (nullptr, wxString::Format ("DCP-o-matic DCP Combiner could not start."), std_to_wx(e.what()));
_("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM,
std_to_wx (e.what()),
std_to_wx (e.file().string().c_str ())
_("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM,
std_to_wx (e.what()),
std_to_wx (e.file().string().c_str ())