From ca56871d4860b8ead384c410fe374c2fa993f88f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 4 May 2020 23:02:45 +0200
Subject: Add KDMWithMetadataPtr typedef

---
 src/wx/kdm_dialog.cc       | 4 ++--
 src/wx/kdm_output_panel.cc | 4 ++--
 src/wx/kdm_output_panel.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/wx')

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 06600ac7a..b067ff04a 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -150,7 +150,7 @@ KDMDialog::make_clicked ()
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	list<shared_ptr<KDMWithMetadata> > screen_kdms;
+	list<KDMWithMetadataPtr> screen_kdms;
 	try {
 		/* Start off by enabling forensic marking for all */
 		optional<int> for_audio;
@@ -175,7 +175,7 @@ KDMDialog::make_clicked ()
 						for_audio
 						);
 
-				screen_kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
+				screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm)));
 			}
 		}
 
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 0320ed1b7..541674ae1 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -183,7 +183,7 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-	list<shared_ptr<KDMWithMetadata> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+	list<KDMWithMetadataPtr> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
 	)
 {
 	list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
@@ -247,7 +247,7 @@ KDMOutputPanel::make (
 
 		if (_write_to->GetValue()) {
 			if (_write_flat->GetValue()) {
-				written = KDMWithMetadata::write_files (
+				written = write_files (
 					screen_kdms,
 					directory(),
 					_filename_format->get(),
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 730cb9360..fbfc1205e 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -52,7 +52,7 @@ public:
 	}
 
 	std::pair<boost::shared_ptr<Job>, int> make (
-		std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms,
+		std::list<KDMWithMetadataPtr > screen_kdms,
 		std::string name,
 		KDMTimingPanel* timing,
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
-- 
cgit v1.2.3