Fix build.

5 files changed, 41 insertions, 42 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index cc80f5bc2..79833b366 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -28,14 +28,13 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/date_time.hpp>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <dcp/signer_chain.h>
 #include <dcp/cpl.h>
 #include <dcp/signer.h>
 #include <dcp/util.h>
-#include <dcp/kdm.h>
+#include <dcp/local_time.h>
 #include "film.h"
 #include "job.h"
 #include "util.h"
@@ -949,12 +948,12 @@ Film::frame_size () const
 	return fit_ratio_within (container()->ratio(), full_frame ());
 }
 
-dcp::KDM
+dcp::EncryptedKDM
 Film::make_kdm (
 	shared_ptr<dcp::Certificate> target,
 	boost::filesystem::path dcp_dir,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime until
+	dcp::LocalTime from,
+	dcp::LocalTime until
 	) const
 {
 	shared_ptr<const Signer> signer = make_signer ();
@@ -967,24 +966,22 @@ Film::make_kdm (
 		throw KDMError (_("Could not read DCP to make KDM for"));
 	}
 	
-	time_t now = time (0);
-	struct tm* tm = localtime (&now);
-	string const issue_date = dcp::tm_to_string (tm);
-	
 	dcp.cpls().front()->set_mxf_keys (key ());
 	
-	return dcp::KDM (dcp.cpls().front(), signer, target, from, until, "DCP-o-matic", issue_date);
+	return dcp::DecryptedKDM (
+		dcp.cpls().front(), from, until, "DCP-o-matic", dcp.cpls().front()->content_title_text(), dcp::LocalTime().as_string()
+		).encrypt (signer, target);
 }
 
-list<dcp::KDM>
+list<dcp::EncryptedKDM>
 Film::make_kdms (
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime until
+	dcp::LocalTime from,
+	dcp::LocalTime until
 	) const
 {
-	list<dcp::KDM> kdms;
+	list<dcp::EncryptedKDM> kdms;
 
 	for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
 		kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until));
diff --git a/src/lib/film.h b/src/lib/film.h
index 9d1445d92..ee8756b3d 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -32,7 +32,8 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
 #include <dcp/key.h>
-#include <dcp/kdm.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"
@@ -116,19 +117,19 @@ public:
 	int best_video_frame_rate () const;
 	FrameRateChange active_frame_rate_change (DCPTime) const;
 
-	dcp::KDM
+	dcp::EncryptedKDM
 	make_kdm (
 		boost::shared_ptr<dcp::Certificate> target,
 		boost::filesystem::path dcp,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime until
+		dcp::LocalTime from,
+		dcp::LocalTime until
 		) const;
 	
-	std::list<dcp::KDM> make_kdms (
+	std::list<dcp::EncryptedKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path dcp,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime until
+		dcp::LocalTime from,
+		dcp::LocalTime until
 		) const;
 
 	dcp::Key key () const {
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 00d2f0537..793a3fa0e 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 <dcp/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, dcp::KDM k)
+	ScreenKDM (shared_ptr<Screen> s, dcp::EncryptedKDM k)
 		: screen (s)
 		, kdm (k)
 	{}
 	
 	shared_ptr<Screen> screen;
-	dcp::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 dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	dcp::LocalTime from,
+	dcp::LocalTime to
 	)
 {
-	list<dcp::KDM> kdms = film->make_kdms (screens, dcp, from, to);
+	list<dcp::EncryptedKDM> kdms = film->make_kdms (screens, dcp, from, to);
 	   
 	list<ScreenKDM> screen_kdms;
 	
 	list<shared_ptr<Screen> >::iterator i = screens.begin ();
-	list<dcp::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 dcp,
-	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, dcp, from, to);
@@ -169,8 +169,8 @@ write_kdm_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
@@ -189,8 +189,8 @@ write_kdm_zip_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	)
 {
@@ -208,8 +208,8 @@ email_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	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, dcp, from, to);
diff --git a/src/lib/kdm.h b/src/lib/kdm.h
index c4fd43d49..5df161b2a 100644
--- a/src/lib/kdm.h
+++ b/src/lib/kdm.h
@@ -27,8 +27,8 @@ extern void write_kdm_files (
 	boost::shared_ptr<const Film> film,
 	std::list<boost::shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	);
 
@@ -36,8 +36,8 @@ extern void write_kdm_zip_files (
 	boost::shared_ptr<const Film> film,
 	std::list<boost::shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
 	boost::filesystem::path directory
 	);
 
@@ -45,7 +45,7 @@ extern void email_kdms (
 	boost::shared_ptr<const Film> film,
 	std::list<boost::shared_ptr<Screen> > screens,
 	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	dcp::LocalTime from,
+	dcp::LocalTime to
 	);
 
diff --git a/src/lib/subrip.cc b/src/lib/subrip.cc
index 3eac98e63..aa4a0b548 100644
--- a/src/lib/subrip.cc
+++ b/src/lib/subrip.cc
@@ -18,6 +18,7 @@
 */
 
 #include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
 #include "subrip.h"
 #include "subrip_content.h"
 #include "subrip_subtitle.h"