Rename ScreenKDM -> KDMWithMetadata

6 files changed, 30 insertions, 30 deletions

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 3af1e0d84..99d151152 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -47,7 +47,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
 
 	name_values['c'] = cinema->name;
 
-	BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+	BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
 		name_values['s'] = i->screen->name;
 		name_values['i'] = i->kdm_id ();
 		string const name = careful_string_filter(name_format.get(name_values, ".xml"));
@@ -57,11 +57,11 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
 	zipper.close ();
 }
 
-/** Collect a list of ScreenKDMs into a list of CinemaKDMs so that each
+/** Collect a list of KDMWithMetadatas into a list of CinemaKDMs so that each
  *  CinemaKDM contains the KDMs for its cinema.
  */
 list<CinemaKDMs>
-CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
+CinemaKDMs::collect (list<shared_ptr<KDMWithMetadata> > screen_kdms)
 {
 	list<CinemaKDMs> cinema_kdms;
 
@@ -71,17 +71,17 @@ CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
 
 		CinemaKDMs ck;
 
-		list<shared_ptr<ScreenKDM> >::iterator i = screen_kdms.begin ();
+		list<shared_ptr<KDMWithMetadata> >::iterator i = screen_kdms.begin ();
 		ck.cinema = (*i)->screen->cinema;
 		ck.screen_kdms.push_back (*i);
-		list<shared_ptr<ScreenKDM> >::iterator j = i;
+		list<shared_ptr<KDMWithMetadata> >::iterator j = i;
 		++i;
 		screen_kdms.remove (*j);
 
 		while (i != screen_kdms.end ()) {
 			if ((*i)->screen->cinema == ck.cinema) {
 				ck.screen_kdms.push_back (*i);
-				list<shared_ptr<ScreenKDM> >::iterator j = i;
+				list<shared_ptr<KDMWithMetadata> >::iterator j = i;
 				++i;
 				screen_kdms.remove (*j);
 			} else {
@@ -117,7 +117,7 @@ CinemaKDMs::write_directories (
 		path /= container_name_format.get(name_values, "");
 		if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
 			boost::filesystem::create_directories (path);
-			ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
+			KDMWithMetadata::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
 		}
 		written += i.screen_kdms.size();
 	}
@@ -209,7 +209,7 @@ CinemaKDMs::email (
 		boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
 		string screens;
-		BOOST_FOREACH (shared_ptr<ScreenKDM> j, i.screen_kdms) {
+		BOOST_FOREACH (shared_ptr<KDMWithMetadata> j, i.screen_kdms) {
 			screens += j->screen->name + ", ";
 		}
 		boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 2b82cdab6..0626ded5d 100644
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -18,7 +18,7 @@
 
 */
 
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 
 class Cinema;
 class Job;
@@ -29,7 +29,7 @@ class CinemaKDMs
 public:
 	void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
 
-	static std::list<CinemaKDMs> collect (std::list<boost::shared_ptr<ScreenKDM> > kdms);
+	static std::list<CinemaKDMs> collect (std::list<boost::shared_ptr<KDMWithMetadata> > kdms);
 
 	static int write_directories (
 		std::list<CinemaKDMs> cinema_kdms,
@@ -58,5 +58,5 @@ public:
 		);
 
 	boost::shared_ptr<Cinema> cinema;
-	std::list<boost::shared_ptr<ScreenKDM> > screen_kdms;
+	std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index cbbdf5964..b233e5ee6 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -50,7 +50,7 @@
 #include "text_content.h"
 #include "ffmpeg_content.h"
 #include "dcp_content.h"
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 #include "cinema.h"
 #include "change_signaller.h"
 #include "check_content_change_job.h"
diff --git a/src/lib/screen_kdm.cc b/src/lib/kdm_with_metadata.cc
index f9a3fa36e..e6b283415 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 #include "cinema.h"
 #include "screen.h"
 #include "util.h"
@@ -30,8 +30,8 @@ using std::list;
 using boost::shared_ptr;
 
 int
-ScreenKDM::write_files (
-	list<shared_ptr<ScreenKDM> > screen_kdms,
+KDMWithMetadata::write_files (
+	list<shared_ptr<KDMWithMetadata> > screen_kdms,
 	boost::filesystem::path directory,
 	dcp::NameFormat name_format,
 	dcp::NameFormat::Map name_values,
@@ -42,7 +42,7 @@ ScreenKDM::write_files (
 
 	if (directory == "-") {
 		/* Write KDMs to the stdout */
-		BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+		BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
 			cout << i->kdm_as_xml ();
 			++written;
 		}
@@ -55,7 +55,7 @@ ScreenKDM::write_files (
 	}
 
 	/* Write KDMs to the specified directory */
-	BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+	BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
 		name_values['c'] = i->screen->cinema ? i->screen->cinema->name : "";
 		name_values['s'] = i->screen->name;
 		name_values['i'] = i->kdm_id ();
diff --git a/src/lib/screen_kdm.h b/src/lib/kdm_with_metadata.h
index a1e36245c..8d6d61daa 100644
--- a/src/lib/screen_kdm.h
+++ b/src/lib/kdm_with_metadata.h
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef DCPOMATIC_SCREEN_KDM_H
-#define DCPOMATIC_SCREEN_KDM_H
+#ifndef DCPOMATIC_KDM_WITH_METADATA_H
+#define DCPOMATIC_KDM_WITH_METADATA_H
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 #include "encrypted_ecinema_kdm.h"
@@ -33,21 +33,21 @@ namespace dcpomatic {
 }
 
 /** Simple class to collect a screen and an encrypted KDM */
-class ScreenKDM
+class KDMWithMetadata
 {
 public:
-	ScreenKDM (boost::shared_ptr<dcpomatic::Screen> s)
+	KDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s)
 		: screen (s)
 	{}
 
-	virtual ~ScreenKDM () {}
+	virtual ~KDMWithMetadata () {}
 
 	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<ScreenKDM> > screen_kdms, boost::filesystem::path directory,
+		std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms, boost::filesystem::path directory,
 		dcp::NameFormat name_format, dcp::NameFormat::Map name_values,
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
@@ -55,11 +55,11 @@ public:
 	boost::shared_ptr<dcpomatic::Screen> screen;
 };
 
-class DCPScreenKDM : public ScreenKDM
+class DCPKDMWithMetadata : public KDMWithMetadata
 {
 public:
-	DCPScreenKDM (boost::shared_ptr<dcpomatic::Screen> s, dcp::EncryptedKDM k)
-		: ScreenKDM (s)
+	DCPKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, dcp::EncryptedKDM k)
+		: KDMWithMetadata (s)
 		, kdm (k)
 	{}
 
@@ -79,11 +79,11 @@ public:
 };
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-class ECinemaScreenKDM : public ScreenKDM
+class ECinemaKDMWithMetadata : public KDMWithMetadata
 {
 public:
-	ECinemaScreenKDM (boost::shared_ptr<dcpomatic::Screen> s, EncryptedECinemaKDM k)
-		: ScreenKDM (s)
+	ECinemaKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, EncryptedECinemaKDM k)
+		: KDMWithMetadata (s)
 		, kdm (k)
 	{}
 
diff --git a/src/lib/wscript b/src/lib/wscript
index ea52079d0..19d68f045 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -125,6 +125,7 @@ sources = """
           job_manager.cc
           j2k_encoder.cc
           json_server.cc
+          kdm_with_metadata.cc
           lock_file_checker.cc
           log.cc
           log_entry.cc
@@ -145,7 +146,6 @@ sources = """
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
-          screen_kdm.cc
           send_kdm_email_job.cc
           send_notification_email_job.cc
           send_problem_report_job.cc