X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=a1dfc60940bfd917ed0365d9ccda6838d4a2f07e;hb=7b16280edec019d0583b52fab25549a91c3676e6;hp=e8fcb5a45f6e35c8cccf924c36b27cd13efaff53;hpb=d2c4aba65a9eb2ee75961cdc860d2f3aa0b1a548;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index e8fcb5a45..a1dfc6094 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -96,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;
 
@@ -120,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,
@@ -131,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,
@@ -160,12 +163,10 @@ 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 ();
+	bool references_dcp_video () const;
+	bool references_dcp_audio () const;
 
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
@@ -293,7 +294,7 @@ public:
 	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);
@@ -336,9 +337,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;