X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=1c5022428a332563ee586ca1441cfc64756ae69c;hb=bf19399f8c009ff211d5c7b45b0941417d963c4e;hp=273077f8f5c646766eef6fc525bf302c2704ea1c;hpb=fad8d13cd779a6237feed2c855a46e1a7c66e0ad;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 273077f8f..1c5022428 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -45,12 +45,15 @@ namespace xmlpp {
 	class Document;
 }
 
+namespace dcpomatic {
+	class Screen;
+}
+
 class DCPContentType;
 class Log;
 class Content;
 class Playlist;
 class AudioContent;
-class Screen;
 class AudioProcessor;
 class AudioMapping;
 class Ratio;
@@ -71,15 +74,15 @@ public:
 	explicit Film (boost::optional<boost::filesystem::path> dir);
 	~Film ();
 
-	boost::filesystem::path info_file (DCPTimePeriod p) const;
+	boost::filesystem::path info_file (dcpomatic::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 (DCPTimePeriod p) const;
+	boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
 
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
 	void send_dcp_to_tms ();
-	void make_dcp ();
+	void make_dcp (bool gui = false);
 
 	/** @return Logger.
 	 *  It is safe to call this from any thread.
@@ -123,14 +126,14 @@ public:
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-	DCPTime length () const;
+	dcpomatic::DCPTime length () const;
 	int best_video_frame_rate () const;
-	FrameRateChange active_frame_rate_change (DCPTime) const;
+	FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const;
 	std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
 	dcp::EncryptedKDM make_kdm (
 		dcp::Certificate recipient,
-		std::vector<dcp::Certificate> trusted_devices,
+		std::vector<std::string> trusted_devices,
 		boost::filesystem::path cpl_file,
 		dcp::LocalTime from,
 		dcp::LocalTime until,
@@ -139,8 +142,8 @@ public:
 		boost::optional<int> disable_forensic_marking_audio
 		) const;
 
-	std::list<ScreenKDM> make_kdms (
-		std::list<boost::shared_ptr<Screen> > screens,
+	std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
+		std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
 		boost::filesystem::path cpl_file,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until,
@@ -155,11 +158,6 @@ public:
 
 	std::string subtitle_language () const;
 
-	void make_audio_mapping_default (
-		AudioMapping & mapping,
-		boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path> ()
-		) const;
-
 	std::vector<std::string> audio_output_names () const;
 
 	void repeat_content (ContentList, int);
@@ -168,10 +166,10 @@ public:
 		return _playlist;
 	}
 
-	std::list<DCPTimePeriod> reels () const;
+	std::list<dcpomatic::DCPTimePeriod> reels () const;
 	std::list<int> mapped_audio_channels () const;
 
-	std::string content_summary (DCPTimePeriod period) const;
+	std::string content_summary (dcpomatic::DCPTimePeriod period) const;
 
 	bool references_dcp_video () const;
 	bool references_dcp_audio () const;
@@ -204,7 +202,10 @@ public:
 		AUDIO_PROCESSOR,
 		REEL_TYPE,
 		REEL_LENGTH,
-		UPLOAD_AFTER_MAKE_DCP
+		UPLOAD_AFTER_MAKE_DCP,
+		REENCODE_J2K,
+		MARKERS,
+		RATINGS
 	};
 
 
@@ -296,6 +297,18 @@ public:
 		return _context_id;
 	}
 
+	bool reencode_j2k () const {
+		return _reencode_j2k;
+	}
+
+	boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
+	std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+		return _markers;
+	}
+
+	std::vector<dcp::Rating> ratings () const {
+		return _ratings;
+	}
 
 	/* SET */
 
@@ -316,7 +329,7 @@ public:
 	void set_key (dcp::Key key);
 	void set_j2k_bandwidth (int);
 	void set_isdcf_metadata (ISDCFMetadata);
-	void set_video_frame_rate (int);
+	void set_video_frame_rate (int rate, bool user_explicit = false);
 	void set_audio_channels (int);
 	void set_three_d (bool);
 	void set_isdcf_date_today ();
@@ -326,6 +339,10 @@ public:
 	void set_reel_type (ReelType);
 	void set_reel_length (int64_t);
 	void set_upload_after_make_dcp (bool);
+	void set_reencode_j2k (bool);
+	void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
+	void unset_marker (dcp::Marker type);
+	void set_ratings (std::vector<dcp::Rating> r);
 
 	/** Emitted when some property has of the Film is about to change or has changed */
 	mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -333,6 +350,9 @@ public:
 	/** Emitted when some property of our content has changed */
 	mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
+	/** Emitted when we have something important to tell the user */
+	boost::signals2::signal<void (std::string)> Message;
+
 	/** Current version number of the state file */
 	static int const current_state_version;
 
@@ -399,6 +419,11 @@ private:
 	/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
 	int64_t _reel_length;
 	bool _upload_after_make_dcp;
+	bool _reencode_j2k;
+	/** true if the user has ever explicitly set the video frame rate of this film */
+	bool _user_explicit_video_frame_rate;
+	std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
+	std::vector<dcp::Rating> _ratings;
 
 	int _state_version;