X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=fc3a531faf8293b69d484581810b0ea3fd351801;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=5dcf275979cbd4ad48b31b676f3216107216e252;hpb=623f3c66821d6a99bf0e683a8072b99a168f3a1c;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index 5dcf27597..fc3a531fa 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -20,12 +20,14 @@
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
+#include <set>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <libxml++/libxml++.h>
 #include "types.h"
+#include "dcpomatic_time.h"
 
 namespace cxml {
 	class Node;
@@ -37,59 +39,118 @@ class Film;
 class ContentProperty
 {
 public:
-	static int const START;
+	static int const PATH;
+	static int const POSITION;
 	static int const LENGTH;
+	static int const TRIM_START;
+	static int const TRIM_END;
 };
 
-class Content : public boost::enable_shared_from_this<Content>
+class Content : public boost::enable_shared_from_this<Content>, public boost::noncopyable
 {
 public:
-	Content (boost::shared_ptr<const Film>, Time);
+	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>, boost::shared_ptr<const cxml::Node>);
-	Content (Content const &);
+	Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 	virtual ~Content () {}
 	
 	virtual void examine (boost::shared_ptr<Job>);
 	virtual std::string summary () const = 0;
+	/** @return Technical details of this content; these are written to logs to
+	 *  help with debugging.
+	 */
+	virtual std::string technical_summary () const;
 	virtual std::string information () const = 0;
 	virtual void as_xml (xmlpp::Node *) const;
-	virtual boost::shared_ptr<Content> clone () const = 0;
-	virtual Time length () const = 0;
+	virtual DCPTime full_length () const = 0;
+	virtual std::string identifier () const;
 
-	boost::filesystem::path file () const {
+	boost::shared_ptr<Content> clone () const;
+
+	void set_path (boost::filesystem::path);
+
+	std::string path_summary () const;
+
+	std::vector<boost::filesystem::path> paths () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _paths;
+	}
+
+	size_t number_of_paths () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _file;
+		return _paths.size ();
 	}
 
+	boost::filesystem::path path (size_t i) const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _paths[i];
+	}
+	
+	bool paths_valid () const;
+
+	/** @return MD5 digest of the content's file(s) */
 	std::string digest () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _digest;
 	}
 
-	void set_start (Time);
+	void set_position (DCPTime);
 
-	Time start () const {
+	/** DCPTime that this content starts; i.e. the time that the first
+	 *  bit of the content (trimmed or not) will happen.
+	 */
+	DCPTime position () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _start;
+		return _position;
 	}
 
-	Time end () const {
-		return start() + length();
+	void set_trim_start (DCPTime);
+
+	DCPTime trim_start () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _trim_start;
 	}
 
-	boost::signals2::signal<void (boost::weak_ptr<Content>, int)> Changed;
+	void set_trim_end (DCPTime);
+	
+	DCPTime trim_end () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _trim_end;
+	}
+	
+	DCPTime end () const {
+		return position() + length_after_trim();
+	}
+
+	DCPTime length_after_trim () const;
+	
+	void set_change_signals_frequent (bool f) {
+		_change_signals_frequent = f;
+	}
+
+	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
 protected:
 	void signal_changed (int);
 
 	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;
+	
 private:
-	boost::filesystem::path _file;
 	std::string _digest;
-	Time _start;
+	DCPTime _position;
+	DCPTime _trim_start;
+	DCPTime _trim_end;
+	bool _change_signals_frequent;
 };
 
 #endif