From 7703a0d95f4188d4e7e9414afc6bfe3259cf1cdc Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 4 May 2020 01:03:26 +0200
Subject: All going downhill.

---
 src/lib/screen_with_kdm.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/lib/screen_with_kdm.h')

diff --git a/src/lib/screen_with_kdm.h b/src/lib/screen_with_kdm.h
index 53fbebf3c..31ed38875 100644
--- a/src/lib/screen_with_kdm.h
+++ b/src/lib/screen_with_kdm.h
@@ -24,6 +24,7 @@
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 #include "encrypted_ecinema_kdm.h"
 #endif
+#include "recipient_with_kdm.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/name_format.h>
 #include <boost/shared_ptr.hpp>
@@ -33,7 +34,7 @@ namespace dcpomatic {
 }
 
 /** Simple class to collect a screen and an encrypted KDM */
-class ScreenWithKDM
+class ScreenWithKDM : public RecipientWithKDM
 {
 public:
 	ScreenWithKDM (boost::shared_ptr<dcpomatic::Screen> s)
@@ -42,15 +43,9 @@ public:
 
 	virtual ~ScreenWithKDM () {}
 
-	virtual std::string kdm_as_xml () const = 0;
-	virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
 	virtual std::string kdm_id () const = 0;
 
-	static int write_files (
-		std::list<boost::shared_ptr<ScreenWithKDM> > screen_kdms, boost::filesystem::path directory,
-		dcp::NameFormat name_format, dcp::NameFormat::Map name_values,
-		boost::function<bool (boost::filesystem::path)> confirm_overwrite
-		);
+	void add_name_values (dcp::NameFormat::Map& values);
 
 	boost::shared_ptr<dcpomatic::Screen> screen;
 };
@@ -67,7 +62,7 @@ public:
 		return kdm.as_xml ();
 	}
 
-	void kdm_as_xml (boost::filesystem::path out) const {
+	void kdm_as_xml_to_file (boost::filesystem::path out) const {
 		return kdm.as_xml (out);
 	}
 
@@ -91,7 +86,7 @@ public:
 		return kdm.as_xml ();
 	}
 
-	void kdm_as_xml (boost::filesystem::path out) const {
+	void kdm_as_xml_to_file (boost::filesystem::path out) const {
 		return kdm.as_xml (out);
 	}
 
-- 
cgit v1.2.3