X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=1eee02e01463e434bd65acd3a1bac53bd7f72170;hb=dc87445987c00b85a44b6372e43894067fae44b3;hp=c066c61e036a047813ecde76a71c2a9d1c9552b6;hpb=5d65df7ebdc96c658a6b7042e639cb395f91bfeb;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index c066c61e0..1eee02e01 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -48,9 +48,11 @@ public:
 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 (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 	virtual ~Content () {}
 	
 	virtual void examine (boost::shared_ptr<Job>);
@@ -58,18 +60,30 @@ public:
 	virtual std::string technical_summary () const;
 	virtual std::string information () const = 0;
 	virtual void as_xml (xmlpp::Node *) const;
-	virtual Time full_length () const = 0;
+	virtual DCPTime full_length () const = 0;
 	virtual std::string identifier () const;
 
 	boost::shared_ptr<Content> clone () const;
 
 	void set_path (boost::filesystem::path);
-	
-	boost::filesystem::path path () const {
+
+	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 _path;
+		return _paths.size ();
 	}
 
+	boost::filesystem::path path (size_t i) const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _paths[i];
+	}
+	
 	bool path_valid () const;
 
 	/** @return MD5 digest of the content's file(s) */
@@ -78,41 +92,41 @@ public:
 		return _digest;
 	}
 
-	void set_position (Time);
+	void set_position (DCPTime);
 
-	/** Time that this content starts; i.e. the time that the first
+	/** DCPTime that this content starts; i.e. the time that the first
 	 *  bit of the content (trimmed or not) will happen.
 	 */
-	Time position () const {
+	DCPTime position () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _position;
 	}
 
-	void set_trim_start (Time);
+	void set_trim_start (DCPTime);
 
-	Time trim_start () const {
+	DCPTime trim_start () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_start;
 	}
 
-	void set_trim_end (Time);
+	void set_trim_end (DCPTime);
 	
-	Time trim_end () const {
+	DCPTime trim_end () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_end;
 	}
 	
-	Time end () const {
-		return position() + length_after_trim();
+	DCPTime end () const {
+		return position() + length_after_trim() - 1;
 	}
 
-	Time length_after_trim () const;
+	DCPTime length_after_trim () const;
 	
 	void set_change_signals_frequent (bool f) {
 		_change_signals_frequent = f;
 	}
 
-	bool trimmed (Time) const;
+	bool trimmed (DCPTime) const;
 
 	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
@@ -126,13 +140,14 @@ protected:
 	*/
 	mutable boost::mutex _mutex;
 
+	/** Paths of our data files */
+	std::vector<boost::filesystem::path> _paths;
+	
 private:
-	/** Path of a file or a directory containing files */
-	boost::filesystem::path _path;
 	std::string _digest;
-	Time _position;
-	Time _trim_start;
-	Time _trim_end;
+	DCPTime _position;
+	DCPTime _trim_start;
+	DCPTime _trim_end;
 	bool _change_signals_frequent;
 };