Move CPLSummary into a faster version in libdcp.

4 files changed, 8 insertions, 7 deletions

diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index f8afa3d71..584aff405 100644
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -94,7 +94,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	h->SetFont (subheading_font);
 	right->Add (h);
 
-	vector<CPLSummary> cpls;
+	vector<dcp::CPLSummary> cpls;
 	for (auto const& i: film->cpls()) {
 		if (i.encrypted) {
 			cpls.push_back (i);
diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index eb02638a2..45ed865dc 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -34,7 +34,7 @@ LIBDCP_ENABLE_WARNINGS
 using std::vector;
 
 
-KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
+KDMCPLPanel::KDMCPLPanel(wxWindow* parent, vector<dcp::CPLSummary> cpls)
 	: wxPanel (parent, wxID_ANY)
 	, _cpls (cpls)
 {
@@ -94,7 +94,7 @@ KDMCPLPanel::update_cpl_summary ()
 		return;
 	}
 
-	_dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory));
+	_dcp_directory->SetLabel(std_to_wx(_cpls[n].dcp_directory.string()));
 	_cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id));
 	_cpl_annotation_text->SetLabel (std_to_wx(_cpls[n].cpl_annotation_text.get_value_or("")));
 
@@ -140,7 +140,7 @@ KDMCPLPanel::cpl_browse_clicked ()
 		*/
 
 		_cpls.push_back (
-			CPLSummary (
+			dcp::CPLSummary(
 				dcp_dir.filename().string(),
 				cpl_document.string_child("Id").substr (9),
 				cpl_document.string_child("ContentTitleText"),
diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h
index 91821d7a3..441823afa 100644
--- a/src/wx/kdm_cpl_panel.h
+++ b/src/wx/kdm_cpl_panel.h
@@ -20,6 +20,7 @@
 
 
 #include "lib/types.h"
+#include <dcp/cpl_summary.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -31,7 +32,7 @@ LIBDCP_ENABLE_WARNINGS
 class KDMCPLPanel : public wxPanel
 {
 public:
-	KDMCPLPanel (wxWindow* parent, std::vector<CPLSummary> cpls);
+	KDMCPLPanel(wxWindow* parent, std::vector<dcp::CPLSummary> cpls);
 
 	boost::filesystem::path cpl () const;
 	bool has_selected () const;
@@ -49,5 +50,5 @@ private:
 	wxStaticText* _cpl_id;
 	wxStaticText* _cpl_annotation_text;
 
-	std::vector<CPLSummary> _cpls;
+	std::vector<dcp::CPLSummary> _cpls;
 };
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index c2dce905f..97aa835c6 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -99,7 +99,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	h->SetFont (subheading_font);
 	right->Add (h);
 
-	vector<CPLSummary> cpls;
+	vector<dcp::CPLSummary> cpls;
 	for (auto const& i: film->cpls()) {
 		if (i.encrypted) {
 			cpls.push_back (i);