X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=b7685bf0937c56f92b1cfea4e65aea1c2f114785;hb=f67bc45820b4e56f90eecb97ba3b7762c119f9b5;hp=f6553df1c47e53c3b1b65be5ca9045691ffaca0d;hpb=de2af791bdfdcd653752cba970e59efc7bf810c7;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index f6553df1c..b7685bf09 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -46,20 +46,24 @@ public:
 class FFmpegContent : public Content
 {
 public:
-	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	FFmpegContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version, std::list<std::string> &);
-	FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+	FFmpegContent (boost::filesystem::path);
+	FFmpegContent (cxml::ConstNodePtr, int version, std::list<std::string> &);
+	FFmpegContent (std::vector<boost::shared_ptr<Content> >);
 
 	boost::shared_ptr<FFmpegContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
 	}
 
-	void examine (boost::shared_ptr<Job>);
-	void use_template (boost::shared_ptr<const Content> c);
+	boost::shared_ptr<const FFmpegContent> shared_from_this () const {
+		return boost::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
+	}
+
+	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
+	void take_settings_from (boost::shared_ptr<const Content> c);
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
-	DCPTime full_length () const;
+	DCPTime full_length (boost::shared_ptr<const Film> film) const;
 
 	std::string identifier () const;
 
@@ -93,8 +97,18 @@ public:
 
 	void signal_subtitle_stream_changed ();
 
+	boost::optional<std::string> decryption_key () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _decryption_key;
+	}
+
+	bool encrypted () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _encrypted;
+	}
+
 private:
-	void add_properties (std::list<UserProperty> &) const;
+	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
 	friend struct ffmpeg_pts_offset_test;
 	friend struct audio_sampling_rate_test;
@@ -105,11 +119,13 @@ private:
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 
-	AVColorRange _color_range;
-	AVColorPrimaries _color_primaries;
-	AVColorTransferCharacteristic _color_trc;
-	AVColorSpace _colorspace;
+	boost::optional<AVColorRange> _color_range;
+	boost::optional<AVColorPrimaries> _color_primaries;
+	boost::optional<AVColorTransferCharacteristic> _color_trc;
+	boost::optional<AVColorSpace> _colorspace;
 	boost::optional<int> _bits_per_pixel;
+	boost::optional<std::string> _decryption_key;
+	bool _encrypted;
 };
 
 #endif