X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=6c3f78895791221297b500ea64b1b4ea730777af;hb=d2137ac5db409e686b4d9b3fa567935a5e416d41;hp=b7d105688d06c2a1bf644544fb43aff9e9fd9c37;hpb=075f418cc6d9be06bed7a1d98257ae8d17ef3019;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index b7d105688..6c3f78895 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -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"
@@ -69,6 +70,7 @@ public:
 
 	boost::filesystem::path video_mxf_filename () const;
 	boost::filesystem::path audio_mxf_filename () const;
+	boost::filesystem::path subtitle_xml_filename () const;
 
 	void send_dcp_to_tms ();
 	void make_dcp ();
@@ -97,20 +99,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;
@@ -118,29 +115,28 @@ public:
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-	Time length () const;
-	bool has_subtitles () const;
-	OutputVideoFrame best_video_frame_rate () const;
-	FrameRateChange active_frame_rate_change (Time) const;
+	DCPTime length () 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,
-		libdcp::KDM::Formulation formulation
+		dcp::LocalTime from,
+		dcp::LocalTime until,
+		dcp::Formulation formulation
 		) 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,
-		libdcp::KDM::Formulation formulation
+		dcp::LocalTime from,
+		dcp::LocalTime until,
+		dcp::Formulation formulation
 		) const;
 
-	libdcp::Key key () const {
+	dcp::Key key () const {
 		return _key;
 	}
 
@@ -161,17 +157,18 @@ public:
 		CONTAINER,
 		RESOLUTION,
 		SCALER,
-		WITH_SUBTITLES,
 		SIGNED,
 		ENCRYPTED,
 		J2K_BANDWIDTH,
 		ISDCF_METADATA,
 		VIDEO_FRAME_RATE,
 		AUDIO_CHANNELS,
-		/** The setting of _three_d has been changed */
+		/** The setting of _three_d has changed */
 		THREE_D,
 		SEQUENCE_VIDEO,
 		INTEROP,
+		/** The setting of _burn_subtitles has changed */
+		BURN_SUBTITLES,
 	};
 
 
@@ -205,10 +202,6 @@ public:
 		return _scaler;
 	}
 
-	bool with_subtitles () const {
-		return _with_subtitles;
-	}
-
 	/* signed is a reserved word */
 	bool is_signed () const {
 		return _signed;
@@ -246,6 +239,10 @@ public:
 	bool interop () const {
 		return _interop;
 	}
+
+	bool burn_subtitles () const {
+		return _burn_subtitles;
+	}
 	
 
 	/* SET */
@@ -262,7 +259,6 @@ public:
 	void set_container (Ratio const *);
 	void set_resolution (Resolution);
 	void set_scaler (Scaler const *);
-	void set_with_subtitles (bool);
 	void set_signed (bool);
 	void set_encrypted (bool);
 	void set_j2k_bandwidth (int);
@@ -273,6 +269,7 @@ public:
 	void set_isdcf_date_today ();
 	void set_sequence_video (bool);
 	void set_interop (bool);
+	void set_burn_subtitles (bool);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -315,8 +312,6 @@ private:
 	Resolution _resolution;
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
-	/** True if subtitles should be shown for this film */
-	bool _with_subtitles;
 	bool _signed;
 	bool _encrypted;
 	/** bandwidth for J2K files in bits per second */
@@ -335,7 +330,8 @@ private:
 	bool _three_d;
 	bool _sequence_video;
 	bool _interop;
-	libdcp::Key _key;
+	bool _burn_subtitles;
+	dcp::Key _key;
 
 	int _state_version;