From 198ea7d7dbd0140f3eeea2cc35ae9f0312ea78a1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 5 May 2020 15:30:15 +0200
Subject: [PATCH] Use a template to clean things up a little.

---
 src/lib/kdm_with_metadata.h | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index e7b3c23ba..8710460ed 100644
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -104,10 +104,11 @@ void email (
 		);
 
 
-class DCPKDMWithMetadata : public KDMWithMetadata
+template <class T>
+class SpecialKDMWithMetadata : public KDMWithMetadata
 {
 public:
-	DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM k)
+	SpecialKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, T k)
 		: KDMWithMetadata (name_values, cinema)
 		, kdm (k)
 	{}
@@ -120,28 +121,13 @@ public:
 		return kdm.as_xml (out);
 	}
 
-	dcp::EncryptedKDM kdm;
+	T kdm;
 };
 
+typedef SpecialKDMWithMetadata<dcp::EncryptedKDM> DCPKDMWithMetadata;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-class ECinemaKDMWithMetadata : public KDMWithMetadata
-{
-public:
-	ECinemaKDMWithMetadata (dcp::NameValues::Map const& name_values, boost::shared_ptr<Cinema> cinema, EncryptedECinemaKDM k)
-		: KDMWithMetadata (name_values, cinema)
-		, kdm (k)
-	{}
-
-	std::string kdm_as_xml () const {
-		return kdm.as_xml ();
-	}
-
-	void kdm_as_xml (boost::filesystem::path out) const {
-		return kdm.as_xml (out);
-	}
-
-	EncryptedECinemaKDM kdm;
-};
+typedef SpecialKDMWithMetadata<EncryptedECinemaKDM> ECinemaKDMWithMetadata;
 #endif
 
 #endif
+
-- 
2.30.2