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

diff --git a/src/lib/content.h b/src/lib/content.h
index 850cb0891..c6fa2c9f4 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
+#include "change_signaller.h"
 #include "user_property.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
@@ -63,18 +64,18 @@ public:
 class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
 {
 public:
-	explicit Content (boost::shared_ptr<const Film>);
-	Content (boost::shared_ptr<const Film>, DCPTime);
-	Content (boost::shared_ptr<const Film>, boost::filesystem::path);
-	Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
-	Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+	explicit Content ();
+	Content (DCPTime);
+	Content (boost::filesystem::path);
+	Content (cxml::ConstNodePtr);
+	Content (std::vector<boost::shared_ptr<Content> >);
 	virtual ~Content () {}
 
 	/** 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<Job> job);
+	virtual void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job> job);
 
 	virtual void take_settings_from (boost::shared_ptr<const Content> c);
 
@@ -89,16 +90,15 @@ public:
 	virtual std::string technical_summary () const;
 
 	virtual void as_xml (xmlpp::Node *, bool with_paths) const;
-	virtual DCPTime full_length () const = 0;
+	virtual DCPTime full_length (boost::shared_ptr<const Film>) 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;
 
-	boost::shared_ptr<Content> clone () const;
+	boost::shared_ptr<Content> clone (boost::shared_ptr<const Film> film) const;
 
-	void set_path (boost::filesystem::path);
 	void set_paths (std::vector<boost::filesystem::path> paths);
 
 	std::string path_summary () const;
@@ -118,6 +118,11 @@ public:
 		return _paths[i];
 	}
 
+	std::time_t last_write_time (size_t i) const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _last_write_times[i];
+	}
+
 	bool paths_valid () const;
 
 	/** @return Digest of the content's file(s).  Note: this is
@@ -129,7 +134,7 @@ public:
 		return _digest;
 	}
 
-	void set_position (DCPTime);
+	void set_position (boost::shared_ptr<const Film> film, DCPTime);
 
 	/** DCPTime that this content starts; i.e. the time that the first
 	 *  bit of the content (trimmed or not) will happen.
@@ -154,11 +159,11 @@ public:
 	}
 
 	/** @return Time immediately after the last thing in this content */
-	DCPTime end () const {
-		return position() + length_after_trim();
+	DCPTime end (boost::shared_ptr<const Film> film) const {
+		return position() + length_after_trim(film);
 	}
 
-	DCPTime length_after_trim () const;
+	DCPTime length_after_trim (boost::shared_ptr<const Film> film) const;
 
 	boost::optional<double> video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -168,46 +173,49 @@ public:
 	void set_video_frame_rate (double r);
 	void unset_video_frame_rate ();
 
-	double active_video_frame_rate () const;
+	double active_video_frame_rate (boost::shared_ptr<const Film> film) const;
 
 	void set_change_signals_frequent (bool f) {
 		_change_signals_frequent = f;
 	}
 
-	boost::shared_ptr<const Film> film () const;
-
 	std::list<UserProperty> user_properties () const;
 
-	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
+	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;
 
 	boost::shared_ptr<VideoContent> video;
 	boost::shared_ptr<AudioContent> audio;
-	std::list<boost::shared_ptr<TextContent> > caption;
-
-	boost::shared_ptr<TextContent> only_caption () const;
-	boost::shared_ptr<TextContent> caption_of_original_type (TextType type) const;
+	std::list<boost::shared_ptr<TextContent> > text;
 
-	void signal_changed (int);
+	boost::shared_ptr<TextContent> only_text () const;
+	boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
 protected:
 
 	virtual void add_properties (std::list<UserProperty> &) const;
 
-	boost::weak_ptr<const Film> _film;
-
 	/** _mutex which should be used to protect accesses, as examine
 	 *  jobs can update content state in threads other than the main one.
 	 */
 	mutable boost::mutex _mutex;
 
-	/** Paths of our data files */
-	std::vector<boost::filesystem::path> _paths;
+	void add_path (boost::filesystem::path p);
 
 private:
 	friend struct ffmpeg_pts_offset_test;
 	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;
+
+	void signal_change (ChangeType, int);
+
+	/** Paths of our data files */
+	std::vector<boost::filesystem::path> _paths;
+	std::vector<std::time_t> _last_write_times;
 
 	std::string _digest;
 	DCPTime _position;