X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=d9d7e82fd2140a4cbf9fae20c69ea9e6badd4db6;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=9d1445d927b81ab7333f3197d2891ef1306de809;hpb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 9d1445d92..d9d7e82fd 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"
@@ -98,7 +99,7 @@ public:
 	dcp::Size full_frame () const;
 	dcp::Size frame_size () const;
 
-	std::list<boost::filesystem::path> dcps () const;
+	std::vector<CPLSummary> cpls () const;
 
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
@@ -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
+		boost::filesystem::path cpl_file,
+		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
+		boost::filesystem::path cpl_file,
+		dcp::LocalTime from,
+		dcp::LocalTime until
 		) const;
 
 	dcp::Key key () const {