diff options
Diffstat (limited to 'src/tools/dcpomatic_verifier.cc')
| -rw-r--r-- | src/tools/dcpomatic_verifier.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/tools/dcpomatic_verifier.cc b/src/tools/dcpomatic_verifier.cc index c881019d8..4b3038027 100644 --- a/src/tools/dcpomatic_verifier.cc +++ b/src/tools/dcpomatic_verifier.cc @@ -80,7 +80,7 @@ enum { class DCPPath { public: - explicit DCPPath(boost::filesystem::path path, vector<dcp::DecryptedKDM> const& kdms) + DCPPath(boost::filesystem::path path, vector<dcp::DecryptedKDM> const& kdms) : _path(std::move(path)) { check(kdms); @@ -126,7 +126,7 @@ private: class DOMFrame : public wxFrame { public: - explicit DOMFrame(wxString const& title, bool start, vector<boost::filesystem::path> const& dcps_to_load) + DOMFrame(wxString const& title, bool start, vector<boost::filesystem::path> const& dcps_to_load) : wxFrame(nullptr, -1, title) /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. @@ -148,19 +148,7 @@ public: auto dcp_sizer = new wxBoxSizer(wxHORIZONTAL); add_label_to_sizer(dcp_sizer, _overall_panel, _("DCPs"), true, 0, wxALIGN_CENTER_VERTICAL); - auto load_dcps = [this](vector<boost::filesystem::path> const& dcps) { - wxProgressDialog progress(variant::wx::dcpomatic(), _("Examining DCPs")); - vector<DCPPath> dcp_paths; - for (auto path: dcps) { - for (auto const& dcp: dcp::find_potential_dcps(path)) { - progress.Pulse(); - dcp_paths.push_back(DCPPath(dcp, _kdms)); - } - } - return dcp_paths; - }; - - auto add = [&load_dcps](wxWindow* parent) { + auto add = [this](wxWindow* parent) { #if wxCHECK_VERSION(3, 1, 4) DirDialog dialog(parent, _("Select DCP(s)"), wxDD_MULTIPLE, "AddVerifierInputPath"); #else @@ -380,6 +368,19 @@ private: _dcps->refresh(); } + vector<DCPPath> load_dcps(vector<boost::filesystem::path> const& dcps) + { + wxProgressDialog progress(variant::wx::dcpomatic(), _("Examining DCPs")); + vector<DCPPath> dcp_paths; + for (auto path: dcps) { + for (auto const& dcp: dcp::find_potential_dcps(path)) { + progress.Pulse(); + dcp_paths.push_back(DCPPath(dcp, _kdms)); + } + } + return dcp_paths; + } + wxPanel* _overall_panel = nullptr; EditableList<DCPPath>* _dcps; std::vector<DCPPath> _dcp_paths; |