X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fkdm.cc;h=c08750961e2c7c77245191e8e99f2b97daf5d875;hp=902f0d33322a48617e71e193801780704a46ca39;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hpb=24d54ea7fe1ba128cf8d3521d6738fc73a7c623e

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 902f0d333..c08750961 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -102,12 +102,12 @@ static list<ScreenKDM>
 make_screen_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
+	boost::filesystem::path cpl,
 	dcp::LocalTime from,
 	dcp::LocalTime to
 	)
 {
-	list<dcp::EncryptedKDM> kdms = film->make_kdms (screens, dcp, from, to);
+	list<dcp::EncryptedKDM> kdms = film->make_kdms (screens, cpl, from, to);
 	   
 	list<ScreenKDM> screen_kdms;
 	
@@ -126,12 +126,12 @@ static list<CinemaKDMs>
 make_cinema_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
+	boost::filesystem::path cpl,
 	dcp::LocalTime from,
 	dcp::LocalTime to
 	)
 {
-	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
+	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, cpl, from, to);
 	list<CinemaKDMs> cinema_kdms;
 
 	while (!screen_kdms.empty ()) {
@@ -171,13 +171,13 @@ void
 write_kdm_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
+	boost::filesystem::path cpl,
 	dcp::LocalTime from,
 	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
-	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
+	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, cpl, from, to);
 
 	/* Write KDMs to the specified directory */
 	for (list<ScreenKDM>::iterator i = screen_kdms.begin(); i != screen_kdms.end(); ++i) {
@@ -191,13 +191,13 @@ void
 write_kdm_zip_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
+	boost::filesystem::path cpl,
 	dcp::LocalTime from,
 	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
-	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
+	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to);
 
 	for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
 		boost::filesystem::path path = directory;
@@ -210,12 +210,12 @@ void
 email_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
+	boost::filesystem::path cpl,
 	dcp::LocalTime from,
 	dcp::LocalTime to
 	)
 {
-	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
+	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to);
 
 	for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {