X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=a2d78aa68539423cca457abb2005f558e6ca68fa;hb=09063d5958cad17ce89935f38f12c4fcbaaedf4f;hp=f09097ccfff3ba99b1ff26c9cff45d3351277626;hpb=8c61932cc0425a67153fd9e8a34ec585bfa985c1;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index f09097ccf..a2d78aa68 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -64,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 (dcpomatic::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);
 
@@ -90,12 +90,13 @@ public:
 	virtual std::string technical_summary () const;
 
 	virtual void as_xml (xmlpp::Node *, bool with_paths) const;
-	virtual DCPTime full_length () const = 0;
+	virtual dcpomatic::DCPTime full_length (boost::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 (boost::shared_ptr<const Film>) const;
 
 	boost::shared_ptr<Content> clone () const;
 
@@ -118,6 +119,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,36 +135,36 @@ public:
 		return _digest;
 	}
 
-	void set_position (DCPTime);
+	void set_position (boost::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 () const {
-		return position() + length_after_trim();
+	dcpomatic::DCPTime end (boost::shared_ptr<const Film> film) const {
+		return position() + length_after_trim(film);
 	}
 
-	DCPTime length_after_trim () const;
+	dcpomatic::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,17 +174,17 @@ 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 (boost::shared_ptr<const Film> film) const;
 
-	std::list<UserProperty> user_properties () const;
+	std::string calculate_digest () const;
 
-	/* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
+	/* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */
 	boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
 
 	boost::shared_ptr<VideoContent> video;
@@ -190,17 +196,14 @@ public:
 
 protected:
 
-	virtual void add_properties (std::list<UserProperty> &) const;
-
-	boost::weak_ptr<const Film> _film;
+	virtual void add_properties (boost::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.
 	 */
 	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;
@@ -211,10 +214,14 @@ private:
 
 	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;
-	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).