X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=ec64c39130c6398670d298f7a76f08e7f710bdb3;hb=2b1f8bb12adc35dcd7f352885cb0f9a80b04093e;hp=1d8af39d81b043ee6a7f16b9fed8893f86ec9bb9;hpb=988ed4fac88965f2fc260f55a05e2db87bb1ecb8;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 1d8af39d8..ec64c3913 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;
@@ -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 ();
@@ -340,6 +339,8 @@ private:
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 	void audio_analysis_finished ();
 
+	static std::string const metadata_file;
+
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
 	boost::shared_ptr<Playlist> _playlist;