X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=df7b56edca41e9ecd5475c2f0a9658f1a1b855e5;hp=d2e164f1d5352e4ce844b7e4dbaa5dfa4f783f5f;hb=7bc2134d658778e04f1756c255e604b4ab5a5831;hpb=a60428e8a618c648fccab0d9c115f1d2a3dea2d2

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index d2e164f1d..df7b56edc 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -41,25 +41,31 @@ public:
 	/** The chosen subtitle stream, or something about it */
 	static int const SUBTITLE_STREAM;
 	static int const FILTERS;
+	static int const KDM;
 };
 
 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<std::shared_ptr<Content>>);
 
-	boost::shared_ptr<FFmpegContent> shared_from_this () {
-		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
+	std::shared_ptr<FFmpegContent> shared_from_this () {
+		return std::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
 	}
 
-	void examine (boost::shared_ptr<Job>);
-	void take_settings_from (boost::shared_ptr<const Content> c);
+	std::shared_ptr<const FFmpegContent> shared_from_this () const {
+		return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
+	}
+
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
+	void take_settings_from (std::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;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
 
@@ -67,51 +73,41 @@ public:
 
 	void set_filters (std::vector<Filter const *> const &);
 
-	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+	std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _subtitle_streams;
 	}
 
-	boost::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
+	std::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _subtitle_stream;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
+	std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams () const;
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _filters;
 	}
 
-	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
+	void set_subtitle_stream (std::shared_ptr<FFmpegSubtitleStream>);
 
-	boost::optional<ContentTime> first_video () const {
+	boost::optional<dcpomatic::ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _first_video;
 	}
 
 	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 (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
 	friend struct ffmpeg_pts_offset_test;
 	friend struct audio_sampling_rate_test;
 
-	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
-	boost::optional<ContentTime> _first_video;
+	std::vector<std::shared_ptr<FFmpegSubtitleStream>> _subtitle_streams;
+	std::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
+	boost::optional<dcpomatic::ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 
@@ -120,8 +116,6 @@ private:
 	boost::optional<AVColorTransferCharacteristic> _color_trc;
 	boost::optional<AVColorSpace> _colorspace;
 	boost::optional<int> _bits_per_pixel;
-	boost::optional<std::string> _decryption_key;
-	bool _encrypted;
 };
 
 #endif