Rename ScreenKDM -> KDMWithMetadata

3 files changed, 15 insertions, 15 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index aea058d80..5976de22a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -65,7 +65,7 @@
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/encode_server_finder.h"
 #include "lib/update_checker.h"
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index ef6b783f4..1ff69d135 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -38,7 +38,7 @@
 #include "lib/util.h"
 #include "lib/screen.h"
 #include "lib/job_manager.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/exceptions.h"
 #include "lib/cinema_kdms.h"
 #include "lib/send_kdm_email_job.h"
@@ -303,7 +303,7 @@ private:
 				return;
 			}
 
-			list<shared_ptr<ScreenKDM> > screen_kdms;
+			list<shared_ptr<KDMWithMetadata> > screen_kdms;
 			string title;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
@@ -328,8 +328,8 @@ private:
 
 					/* Encrypt */
 					screen_kdms.push_back (
-						shared_ptr<ScreenKDM>(
-							new ECinemaScreenKDM(i, kdm.encrypt(i->recipient.get()))
+						shared_ptr<KDMWithMetadata>(
+							new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get()))
 							)
 						);
 				}
@@ -371,8 +371,8 @@ private:
 
 					/* Encrypt */
 					screen_kdms.push_back (
-						shared_ptr<ScreenKDM>(
-							new DCPScreenKDM(
+						shared_ptr<KDMWithMetadata>(
+							new DCPKDMWithMetadata(
 								i,
 								kdm.encrypt(
 									signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 505a70c2b..1aad31cb5 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -24,7 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
@@ -130,7 +130,7 @@ always_overwrite ()
 
 void
 write_files (
-	list<shared_ptr<ScreenKDM> > screen_kdms,
+	list<shared_ptr<KDMWithMetadata> > screen_kdms,
 	bool zip,
 	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
@@ -153,7 +153,7 @@ write_files (
 			cout << "Wrote " << N << " ZIP files to " << output << "\n";
 		}
 	} else {
-		int const N = ScreenKDM::write_files (
+		int const N = KDMWithMetadata::write_files (
 			screen_kdms, output, filename_format, values,
 			bind (&always_overwrite)
 			);
@@ -229,7 +229,7 @@ from_film (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<shared_ptr<ScreenKDM> > kdms;
+		list<shared_ptr<KDMWithMetadata> > kdms;
 
 		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
 			if (i->recipient) {
@@ -244,7 +244,7 @@ from_film (
 						disable_forensic_marking_audio
 						);
 
-				kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
+				kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
 			}
 		}
 
@@ -345,15 +345,15 @@ from_dkdm (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<shared_ptr<ScreenKDM> > screen_kdms;
+		list<shared_ptr<KDMWithMetadata> > screen_kdms;
 		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
 			if (!i->recipient) {
 				continue;
 			}
 
 			screen_kdms.push_back (
-				shared_ptr<ScreenKDM>(
-					new DCPScreenKDM(
+				shared_ptr<KDMWithMetadata>(
+					new DCPKDMWithMetadata(
 						i,
 						kdm_from_dkdm(
 							dkdm,