X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=550b3cd9cf52770e7a9acb7786a86dac3829130d;hp=c6fa2c9f4ea315dc47e18a3b5b7653f463d021c7;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/src/lib/content.h b/src/lib/content.h
index c6fa2c9f4..550b3cd9c 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/lib/content.h
  *  @brief Content class.
  */
 
+
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
@@ -34,7 +36,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/enable_shared_from_this.hpp>
+
 
 namespace xmlpp {
 	class Node;
@@ -46,6 +48,7 @@ namespace cxml {
 
 class Job;
 class Film;
+class AtmosContent;
 
 class ContentProperty
 {
@@ -58,26 +61,30 @@ public:
 	static int const VIDEO_FRAME_RATE;
 };
 
+
 /** @class Content
  *  @brief A piece of content represented by one or more files on disk.
  */
-class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
+class Content : public std::enable_shared_from_this<Content>, public Signaller
 {
 public:
 	explicit Content ();
-	Content (DCPTime);
+	Content (dcpomatic::DCPTime);
 	Content (boost::filesystem::path);
 	Content (cxml::ConstNodePtr);
-	Content (std::vector<boost::shared_ptr<Content> >);
+	Content (std::vector<std::shared_ptr<Content>>);
 	virtual ~Content () {}
 
+	Content (Content const&) = delete;
+	Content& operator= (Content const&) = delete;
+
 	/** Examine the content to establish digest, frame rates and any other
 	 *  useful metadata.
 	 *  @param job Job to use to report progress, or 0.
 	 */
-	virtual void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job> job);
+	virtual void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job> job);
 
-	virtual void take_settings_from (boost::shared_ptr<const Content> c);
+	virtual void take_settings_from (std::shared_ptr<const Content> c);
 
 	/** @return Quick one-line summary of the content, as will be presented in the
 	 *  film editor.
@@ -90,14 +97,15 @@ public:
 	virtual std::string technical_summary () const;
 
 	virtual void as_xml (xmlpp::Node *, bool with_paths) const;
-	virtual DCPTime full_length (boost::shared_ptr<const Film>) const = 0;
+	virtual dcpomatic::DCPTime full_length (std::shared_ptr<const Film>) const = 0;
+	virtual dcpomatic::DCPTime approximate_length () const = 0;
 	virtual std::string identifier () const;
 	/** @return points at which to split this content when
 	 *  REELTYPE_BY_VIDEO_CONTENT is in use.
 	 */
-	virtual std::list<DCPTime> reel_split_points () const;
+	virtual std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film>) const;
 
-	boost::shared_ptr<Content> clone (boost::shared_ptr<const Film> film) const;
+	std::shared_ptr<Content> clone () const;
 
 	void set_paths (std::vector<boost::filesystem::path> paths);
 
@@ -134,36 +142,36 @@ public:
 		return _digest;
 	}
 
-	void set_position (boost::shared_ptr<const Film> film, DCPTime);
+	void set_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime, bool force_emit = false);
 
-	/** DCPTime that this content starts; i.e. the time that the first
+	/** dcpomatic::DCPTime that this content starts; i.e. the time that the first
 	 *  bit of the content (trimmed or not) will happen.
 	 */
-	DCPTime position () const {
+	dcpomatic::DCPTime position () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _position;
 	}
 
-	void set_trim_start (ContentTime);
+	void set_trim_start (dcpomatic::ContentTime);
 
-	ContentTime trim_start () const {
+	dcpomatic::ContentTime trim_start () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_start;
 	}
 
-	void set_trim_end (ContentTime);
+	void set_trim_end (dcpomatic::ContentTime);
 
-	ContentTime trim_end () const {
+	dcpomatic::ContentTime trim_end () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_end;
 	}
 
 	/** @return Time immediately after the last thing in this content */
-	DCPTime end (boost::shared_ptr<const Film> film) const {
+	dcpomatic::DCPTime end (std::shared_ptr<const Film> film) const {
 		return position() + length_after_trim(film);
 	}
 
-	DCPTime length_after_trim (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime length_after_trim (std::shared_ptr<const Film> film) const;
 
 	boost::optional<double> video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -173,29 +181,30 @@ public:
 	void set_video_frame_rate (double r);
 	void unset_video_frame_rate ();
 
-	double active_video_frame_rate (boost::shared_ptr<const Film> film) const;
+	double active_video_frame_rate (std::shared_ptr<const Film> film) const;
 
 	void set_change_signals_frequent (bool f) {
 		_change_signals_frequent = f;
 	}
 
-	std::list<UserProperty> user_properties () const;
+	std::list<UserProperty> user_properties (std::shared_ptr<const Film> film) const;
 
 	std::string calculate_digest () const;
 
-	/* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
-	boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
+	/* ChangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::DONE always from GUI thread */
+	boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
 
-	boost::shared_ptr<VideoContent> video;
-	boost::shared_ptr<AudioContent> audio;
-	std::list<boost::shared_ptr<TextContent> > text;
+	std::shared_ptr<VideoContent> video;
+	std::shared_ptr<AudioContent> audio;
+	std::list<std::shared_ptr<TextContent>> text;
+	std::shared_ptr<AtmosContent> atmos;
 
-	boost::shared_ptr<TextContent> only_text () const;
-	boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
+	std::shared_ptr<TextContent> only_text () const;
+	std::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
 protected:
 
-	virtual void add_properties (std::list<UserProperty> &) const;
+	virtual void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
 	/** _mutex which should be used to protect accesses, as examine
 	 *  jobs can update content state in threads other than the main one.
@@ -209,7 +218,7 @@ private:
 	friend struct best_dcp_frame_rate_test_single;
 	friend struct best_dcp_frame_rate_test_double;
 	friend struct audio_sampling_rate_test;
-	template<class> friend class ChangeSignaller;
+	template<class, class> friend class ChangeSignaller;
 
 	void signal_change (ChangeType, int);
 
@@ -218,9 +227,9 @@ private:
 	std::vector<std::time_t> _last_write_times;
 
 	std::string _digest;
-	DCPTime _position;
-	ContentTime _trim_start;
-	ContentTime _trim_end;
+	dcpomatic::DCPTime _position;
+	dcpomatic::ContentTime _trim_start;
+	dcpomatic::ContentTime _trim_end;
 	/** The video frame rate that this content is or was prepared to be used with,
 	 *  or empty if the effective rate of this content should be dictated by something
 	 *  else (either some video happening at the same time, or the rate of the DCP).
@@ -229,4 +238,8 @@ private:
 	bool _change_signals_frequent;
 };
 
+
+typedef ChangeSignaller<Content, int> ContentChangeSignaller;
+
+
 #endif