X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=0aa3dab3f05a7388b7c0a6f02062321b366b956f;hb=a5ea5c0d2637dd41e3d356cb62cac75b8cadf8ce;hp=ad94852a2486e9757a888d205a70a33ee7e9f735;hpb=b55c6c5496f6c8248dd51bbcaecb80ef0efcbadb;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index ad94852a2..0aa3dab3f 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,6 @@ namespace xmlpp {
 class DCPContentType;
 class Log;
 class Content;
-class Player;
 class Playlist;
 class AudioContent;
 class Screen;
@@ -89,7 +88,7 @@ public:
 	}
 
 	boost::filesystem::path file (boost::filesystem::path f) const;
-	boost::filesystem::path dir (boost::filesystem::path d) const;
+	boost::filesystem::path dir (boost::filesystem::path d, bool create = true) const;
 
 	void use_template (std::string name);
 	std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
@@ -97,6 +96,8 @@ public:
 	void write_template (boost::filesystem::path path) const;
 	boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
 
+	void copy_from (boost::shared_ptr<const Film> film);
+
 	std::string isdcf_name (bool if_created_now) const;
 	std::string dcp_name (bool if_created_now = false) const;
 
@@ -121,6 +122,7 @@ public:
 	DCPTime length () const;
 	int best_video_frame_rate () const;
 	FrameRateChange active_frame_rate_change (DCPTime) const;
+	std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
 	dcp::EncryptedKDM make_kdm (
 		dcp::Certificate recipient,
@@ -132,7 +134,7 @@ public:
 		) const;
 
 	std::list<ScreenKDM> make_kdms (
-		std::list<boost::shared_ptr<Screen> >,
+		std::list<boost::shared_ptr<Screen> > screens,
 		boost::filesystem::path cpl_file,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until,
@@ -161,9 +163,6 @@ public:
 	std::list<DCPTimePeriod> reels () const;
 	std::list<int> mapped_audio_channels () const;
 
-	/** @param A period within the DCP
-	 *  @return Name of the content which most contributes to the given period.
-	 */
 	std::string content_summary (DCPTimePeriod period) const;
 
 	std::list<std::string> fix_conflicting_settings ();
@@ -284,12 +283,17 @@ public:
 		return _upload_after_make_dcp;
 	}
 
+	std::string context_id () const {
+		return _context_id;
+	}
+
+
 	/* SET */
 
 	void set_directory (boost::filesystem::path);
 	void set_name (std::string);
 	void set_use_isdcf_name (bool);
-	void examine_and_add_content (boost::shared_ptr<Content>);
+	void examine_and_add_content (boost::shared_ptr<Content> content, bool disable_audio_analysis = false);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
 	void remove_content (ContentList);
@@ -332,9 +336,11 @@ private:
 	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 maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
 	void audio_analysis_finished ();
 
+	static std::string const metadata_file;
+
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
 	boost::shared_ptr<Playlist> _playlist;
@@ -357,6 +363,10 @@ private:
 	bool _signed;
 	bool _encrypted;
 	dcp::Key _key;
+	/** context ID used when encrypting picture assets; we keep it so that we can
+	 *  re-start picture MXF encodes.
+	 */
+	std::string _context_id;
 	/** bandwidth for J2K files in bits per second */
 	int _j2k_bandwidth;
 	/** ISDCF naming stuff */