diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-20 16:16:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-20 16:16:03 +0000 |
| commit | cfd4beb36642439db23603f9b8099294761e4624 (patch) | |
| tree | 3e79ba3ea6089033a97917d1e977f94da551422d /src/lib/kdm.cc | |
| parent | 1f8b45c7fd49714628009f5ed2161fbaa2b4d729 (diff) | |
Fix build.
Diffstat (limited to 'src/lib/kdm.cc')
| -rw-r--r-- | src/lib/kdm.cc | 30 |
1 files changed, 15 insertions, 15 deletions
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); |
