X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=b8e31a4205650c08a4fd8775948f93ffca773aa7;hb=b0d41c5a78f852619cde4249860c6bbe490804ff;hp=aa7be939ea950262a52f2ff9d677ca7982643bd6;hpb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index aa7be939e..b8e31a420 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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
@@ -54,6 +54,7 @@ class AudioProcessor;
 class AudioMapping;
 class Ratio;
 class Job;
+class ScreenKDM;
 struct isdcf_name_test;
 
 /** @class Film
@@ -69,10 +70,10 @@ public:
 	Film (boost::filesystem::path, bool log = true);
 	~Film ();
 
-	boost::filesystem::path info_file () const;
-	boost::filesystem::path j2c_path (int, Eyes, bool) const;
+	boost::filesystem::path info_file (DCPTimePeriod p) const;
+	boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
 	boost::filesystem::path internal_video_asset_dir () const;
-	boost::filesystem::path internal_video_asset_filename () const;
+	boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const;
 
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
@@ -120,18 +121,19 @@ public:
 
 	dcp::EncryptedKDM
 	make_kdm (
-		dcp::Certificate target,
+		dcp::Certificate recipient,
+		std::vector<dcp::Certificate> trusted_devices,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
 		dcp::LocalTime until,
 		dcp::Formulation formulation
 		) const;
 
-	std::list<dcp::EncryptedKDM> make_kdms (
+	std::list<ScreenKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
-		dcp::LocalTime from,
-		dcp::LocalTime until,
+		boost::posix_time::ptime from,
+		boost::posix_time::ptime until,
 		dcp::Formulation formulation
 		) const;
 
@@ -150,6 +152,8 @@ public:
 		return _playlist;
 	}
 
+	std::list<DCPTimePeriod> reels () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -159,6 +163,8 @@ public:
 		USE_ISDCF_NAME,
 		/** The playlist's content list has changed (i.e. content has been added or removed) */
 		CONTENT,
+		/** The order of content in the playlist has changed */
+		CONTENT_ORDER,
 		DCP_CONTENT_TYPE,
 		CONTAINER,
 		RESOLUTION,
@@ -171,9 +177,12 @@ public:
 		AUDIO_CHANNELS,
 		/** The setting of _three_d has changed */
 		THREE_D,
-		SEQUENCE_VIDEO,
+		SEQUENCE,
 		INTEROP,
 		AUDIO_PROCESSOR,
+		REEL_TYPE,
+		REEL_LENGTH,
+		UPLOAD_AFTER_MAKE_DCP
 	};
 
 
@@ -237,8 +246,8 @@ public:
 		return _three_d;
 	}
 
-	bool sequence_video () const {
-		return _sequence_video;
+	bool sequence () const {
+		return _sequence;
 	}
 
 	bool interop () const {
@@ -249,6 +258,17 @@ public:
 		return _audio_processor;
 	}
 
+	ReelType reel_type () const {
+		return _reel_type;
+	}
+
+	int64_t reel_length () const {
+		return _reel_length;
+	}
+
+	bool upload_after_make_dcp () const {
+		return _upload_after_make_dcp;
+	}
 
 	/* SET */
 
@@ -274,9 +294,12 @@ public:
 	void set_audio_channels (int);
 	void set_three_d (bool);
 	void set_isdcf_date_today ();
-	void set_sequence_video (bool);
+	void set_sequence (bool);
 	void set_interop (bool);
 	void set_audio_processor (AudioProcessor const * processor);
+	void set_reel_type (ReelType);
+	void set_reel_length (int64_t);
+	void set_upload_after_make_dcp (bool);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -294,6 +317,7 @@ private:
 	void signal_changed (Property);
 	std::string video_identifier () const;
 	void playlist_changed ();
+	void playlist_order_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 	void audio_analysis_finished ();
@@ -334,9 +358,13 @@ private:
 	    This will be regardless of what content is on the playlist.
 	*/
 	bool _three_d;
-	bool _sequence_video;
+	bool _sequence;
 	bool _interop;
 	AudioProcessor const * _audio_processor;
+	ReelType _reel_type;
+	/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
+	int64_t _reel_length;
+	bool _upload_after_make_dcp;
 
 	int _state_version;
 
@@ -344,6 +372,7 @@ private:
 	mutable bool _dirty;
 
 	boost::signals2::scoped_connection _playlist_changed_connection;
+	boost::signals2::scoped_connection _playlist_order_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_changed_connection;
 	std::list<boost::signals2::connection> _job_connections;
 	std::list<boost::signals2::connection> _audio_analysis_connections;