X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=67d00aa54afe8d977a26ffc1edddb18a5a36b009;hb=a5139de256c287459e04c75712614b2e7246a89a;hp=f77309862badc22fd540006ead58e98726c6f9ef;hpb=e7bc3bd16456c17bc6fe1d7981040b14e820505e;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index f77309862..67d00aa54 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,8 +31,9 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/key.h>
-#include <libdcp/kdm.h>
+#include <dcp/key.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "isdcf_metadata.h"
@@ -46,6 +47,7 @@ class Playlist;
 class AudioContent;
 class Scaler;
 class Screen;
+class isdcf_name_test;
 
 /** @class Film
  *
@@ -96,20 +98,15 @@ public:
 		return _dirty;
 	}
 
-	libdcp::Size full_frame () const;
-	libdcp::Size frame_size () const;
+	dcp::Size full_frame () const;
+	dcp::Size frame_size () const;
 
 	std::vector<CPLSummary> cpls () const;
 
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
-	OutputAudioFrame audio_frame_rate () const;
-
-	OutputAudioFrame time_to_audio_frames (Time) const;
-	OutputVideoFrame time_to_video_frames (Time) const;
-	Time video_frames_to_time (OutputVideoFrame) const;
-	Time audio_frames_to_time (OutputAudioFrame) const;
+	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double &, double &) const;
@@ -117,27 +114,27 @@ public:
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-	Time length () const;
+	DCPTime length () const;
 	bool has_subtitles () const;
-	OutputVideoFrame best_video_frame_rate () const;
-	FrameRateChange active_frame_rate_change (Time) const;
+	int best_video_frame_rate () const;
+	FrameRateChange active_frame_rate_change (DCPTime) const;
 
-	libdcp::KDM
+	dcp::EncryptedKDM
 	make_kdm (
-		boost::shared_ptr<libdcp::Certificate> target,
+		boost::shared_ptr<dcp::Certificate> target,
 		boost::filesystem::path cpl_file,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime until
+		dcp::LocalTime from,
+		dcp::LocalTime until
 		) const;
 	
-	std::list<libdcp::KDM> make_kdms (
+	std::list<dcp::EncryptedKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
-		boost::posix_time::ptime from,
-		boost::posix_time::ptime until
+		dcp::LocalTime from,
+		dcp::LocalTime until
 		) const;
 
-	libdcp::Key key () const {
+	dcp::Key key () const {
 		return _key;
 	}
 
@@ -282,6 +279,8 @@ public:
 
 private:
 
+	friend class ::isdcf_name_test;
+
 	void signal_changed (Property);
 	std::string video_identifier () const;
 	void playlist_changed ();
@@ -330,7 +329,7 @@ private:
 	bool _three_d;
 	bool _sequence_video;
 	bool _interop;
-	libdcp::Key _key;
+	dcp::Key _key;
 
 	int _state_version;