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

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index d5d5ec0a0..c08750961 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -21,7 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <quickmail.h>
 #include <zip.h>
-#include <libdcp/kdm.h>
+#include <dcp/encrypted_kdm.h>
 #include "kdm.h"
 #include "cinema.h"
 #include "exceptions.h"
@@ -36,13 +36,13 @@ using boost::shared_ptr;
 
 struct ScreenKDM
 {
-	ScreenKDM (shared_ptr<Screen> s, libdcp::KDM k)
+	ScreenKDM (shared_ptr<Screen> s, dcp::EncryptedKDM k)
 		: screen (s)
 		, kdm (k)
 	{}
 	
 	shared_ptr<Screen> screen;
-	libdcp::KDM kdm;
+	dcp::EncryptedKDM kdm;
 };
 
 static string
@@ -103,16 +103,16 @@ make_screen_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path cpl,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	dcp::LocalTime from,
+	dcp::LocalTime to
 	)
 {
-	list<libdcp::KDM> kdms = film->make_kdms (screens, cpl, from, to);
+	list<dcp::EncryptedKDM> kdms = film->make_kdms (screens, cpl, from, to);
 	   
 	list<ScreenKDM> screen_kdms;
 	
 	list<shared_ptr<Screen> >::iterator i = screens.begin ();
-	list<libdcp::KDM>::iterator j = kdms.begin ();
+	list<dcp::EncryptedKDM>::iterator j = kdms.begin ();
 	while (i != screens.end() && j != kdms.end ()) {
 		screen_kdms.push_back (ScreenKDM (*i, *j));
 		++i;
@@ -127,8 +127,8 @@ make_cinema_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path cpl,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	dcp::LocalTime from,
+	dcp::LocalTime to
 	)
 {
 	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, cpl, from, to);
@@ -172,8 +172,8 @@ write_kdm_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path cpl,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
@@ -192,8 +192,8 @@ write_kdm_zip_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path cpl,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
@@ -211,8 +211,8 @@ email_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path cpl,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	dcp::LocalTime from,
+	dcp::LocalTime to
 	)
 {
 	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to);