X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=17bdd09ebc35aaeaf0b9670d75d89736535d7cfc;hb=ba6c93aab4cc43d62f6becc62485d982af7f4a3f;hp=ac25323b932cae277acb3e149b9f4c9108ca144b;hpb=a193afb89de3e335612e07a3fbec3e4095f14f98;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index ac25323b9..17bdd09eb 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -30,7 +30,6 @@
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
-#include "ratio.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
@@ -40,6 +39,10 @@
 #include <vector>
 #include <inttypes.h>
 
+namespace xmlpp {
+	class Document;
+}
+
 class DCPContentType;
 class Log;
 class Content;
@@ -49,6 +52,9 @@ class AudioContent;
 class Screen;
 class AudioProcessor;
 class AudioMapping;
+class Ratio;
+class Job;
+class ScreenKDM;
 struct isdcf_name_test;
 
 /** @class Film
@@ -64,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;
 
@@ -101,13 +107,11 @@ public:
 
 	std::vector<CPLSummary> cpls () const;
 
-	boost::shared_ptr<Playlist> playlist () const;
-
 	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
-	
+
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
@@ -117,14 +121,15 @@ 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,
@@ -141,6 +146,14 @@ public:
 	void make_audio_mapping_default (AudioMapping & mapping) const;
 	std::vector<std::string> audio_output_names () const;
 
+	void repeat_content (ContentList, int);
+
+	boost::shared_ptr<const Playlist> playlist () const {
+		return _playlist;
+	}
+
+	std::list<DCPTimePeriod> reels () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -164,9 +177,9 @@ public:
 		THREE_D,
 		SEQUENCE_VIDEO,
 		INTEROP,
-		/** The setting of _burn_subtitles has changed */
-		BURN_SUBTITLES,
 		AUDIO_PROCESSOR,
+		REEL_TYPE,
+		REEL_LENGTH
 	};
 
 
@@ -200,7 +213,7 @@ public:
 	bool is_signed () const {
 		return _signed;
 	}
-	
+
 	bool encrypted () const {
 		return _encrypted;
 	}
@@ -238,14 +251,17 @@ public:
 		return _interop;
 	}
 
-	bool burn_subtitles () const {
-		return _burn_subtitles;
-	}
-
 	AudioProcessor const * audio_processor () const {
 		return _audio_processor;
 	}
-	
+
+	ReelType reel_type () const {
+		return _reel_type;
+	}
+
+	int64_t reel_length () const {
+		return _reel_length;
+	}
 
 	/* SET */
 
@@ -256,6 +272,7 @@ public:
 	void examine_and_add_content (boost::shared_ptr<Content>);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
+	void remove_content (ContentList);
 	void move_content_earlier (boost::shared_ptr<Content>);
 	void move_content_later (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
@@ -272,8 +289,9 @@ public:
 	void set_isdcf_date_today ();
 	void set_sequence_video (bool);
 	void set_interop (bool);
-	void set_burn_subtitles (bool);
 	void set_audio_processor (AudioProcessor const * processor);
+	void set_reel_type (ReelType);
+	void set_reel_length (int64_t);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -292,8 +310,8 @@ private:
 	std::string video_identifier () const;
 	void playlist_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
-	std::string filename_safe_name () const;
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+	void audio_analysis_finished ();
 
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
@@ -303,7 +321,7 @@ private:
 	 *  must not be relative.
 	 */
 	boost::filesystem::path _directory;
-	
+
 	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated ISDCF-compliant name should be used for our DCP */
@@ -333,8 +351,10 @@ private:
 	bool _three_d;
 	bool _sequence_video;
 	bool _interop;
-	bool _burn_subtitles;
 	AudioProcessor const * _audio_processor;
+	ReelType _reel_type;
+	/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
+	int64_t _reel_length;
 
 	int _state_version;
 
@@ -344,6 +364,7 @@ private:
 	boost::signals2::scoped_connection _playlist_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;
 
 	friend struct paths_test;
 	friend struct film_metadata_test;