X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.h;h=2e07334de7eca49e85c96899ffe6d739b0270637;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=7309ee2d6b3c58504e144adf24ac87a32aa98fa8;hpb=6a63fd3497407f4ac978205e17a358af095882be;p=dcpomatic.git

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index 7309ee2d6..2e07334de 100644
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -21,9 +21,6 @@
 #ifndef DCPOMATIC_KDM_WITH_METADATA_H
 #define DCPOMATIC_KDM_WITH_METADATA_H
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "encrypted_ecinema_kdm.h"
-#endif
 #include <dcp/encrypted_kdm.h>
 #include <dcp/name_format.h>
 #include <boost/shared_ptr.hpp>
@@ -33,15 +30,20 @@ class Cinema;
 class KDMWithMetadata
 {
 public:
-	KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema)
+	KDMWithMetadata (dcp::NameFormat::Map const& name_values, void const* group, std::list<std::string> emails, dcp::EncryptedKDM kdm)
 		: _name_values (name_values)
-		, _cinema (cinema)
+		, _group (group)
+		, _emails (emails)
+		, _kdm (kdm)
 	{}
 
-	virtual ~KDMWithMetadata () {}
+	std::string kdm_as_xml () const {
+		return _kdm.as_xml ();
+	}
 
-	virtual std::string kdm_as_xml () const = 0;
-	virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
+	void kdm_as_xml (boost::filesystem::path out) const {
+		return _kdm.as_xml (out);
+	}
 
 	dcp::NameFormat::Map const& name_values () const {
 		return _name_values;
@@ -49,13 +51,19 @@ public:
 
 	boost::optional<std::string> get (char k) const;
 
-	boost::shared_ptr<Cinema> cinema () const {
-		return _cinema;
+	void const* group () const {
+		return _group;
+	}
+
+	std::list<std::string> emails () const {
+		return _emails;
 	}
 
 private:
 	dcp::NameFormat::Map _name_values;
-	boost::shared_ptr<Cinema> _cinema;
+	void const* _group;
+	std::list<std::string> _emails;
+	dcp::EncryptedKDM _kdm;
 };
 
 
@@ -75,7 +83,7 @@ std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr>
 
 
 int write_directories (
-		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+		std::list<std::list<KDMWithMetadataPtr> > kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -84,7 +92,7 @@ int write_directories (
 
 
 int write_zip_files (
-		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+		std::list<std::list<KDMWithMetadataPtr> > kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -93,37 +101,11 @@ int write_zip_files (
 
 
 void email (
-		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+		std::list<std::list<KDMWithMetadataPtr> > kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
 		std::string cpl_name
 		);
 
-
-template <class T>
-class SpecialKDMWithMetadata : public KDMWithMetadata
-{
-public:
-	SpecialKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, T 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);
-	}
-
-	T kdm;
-};
-
-typedef SpecialKDMWithMetadata<dcp::EncryptedKDM> DCPKDMWithMetadata;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-typedef SpecialKDMWithMetadata<EncryptedECinemaKDM> ECinemaKDMWithMetadata;
-#endif
-
 #endif