X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=14fa3c36a933b3f0389bb84917a1b90363567aa1;hb=d456cc07a466329a4c07e5c13322b34814e6489e;hp=c6cede5fa6cafde4d04f18dc1943a3551c858a2c;hpb=59e769023c392c332331567a1aea94660002c463;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index c6cede5fa..14fa3c36a 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -25,14 +25,18 @@
 #define DCPOMATIC_CONTENT_H
 
 #include "types.h"
+#include "signaller.h"
 #include "dcpomatic_time.h"
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+	class Node;
+}
+
 namespace cxml {
 	class Node;
 }
@@ -53,7 +57,7 @@ public:
 /** @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 boost::noncopyable
+class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
 {
 public:
 	Content (boost::shared_ptr<const Film>);
@@ -68,21 +72,23 @@ public:
 	 *  @param job Job to use to report progress, or 0.
 	 */
 	virtual void examine (boost::shared_ptr<Job> job);
-	
+
 	/** @return Quick one-line summary of the content, as will be presented in the
 	 *  film editor.
 	 */
 	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 void as_xml (xmlpp::Node *) const;
 	virtual DCPTime full_length () const = 0;
 	virtual std::string identifier () const;
 
+	std::list<std::pair<std::string, std::string> > properties () const;
+
 	boost::shared_ptr<Content> clone () const;
 
 	void set_path (boost::filesystem::path);
@@ -103,12 +109,12 @@ public:
 		boost::mutex::scoped_lock lm (_mutex);
 		return _paths[i];
 	}
-	
+
 	bool paths_valid () const;
 
        /** @return Digest of the content's file(s).  Note: this is
         *  not a complete MD5-or-whatever hash, but a sort of poor
-        *  man' version (see comments in ::examine).
+        *  man's version (see comments in ::examine).
         */
 	std::string digest () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -125,26 +131,27 @@ public:
 		return _position;
 	}
 
-	void set_trim_start (DCPTime);
+	void set_trim_start (ContentTime);
 
-	DCPTime trim_start () const {
+	ContentTime trim_start () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _trim_start;
 	}
 
-	void set_trim_end (DCPTime);
-	
-	DCPTime trim_end () const {
+	void set_trim_end (ContentTime);
+
+	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();
 	}
 
 	DCPTime length_after_trim () const;
-	
+
 	void set_change_signals_frequent (bool f) {
 		_change_signals_frequent = f;
 	}
@@ -157,6 +164,7 @@ public:
 
 protected:
 	void signal_changed (int);
+	virtual void add_properties (std::list<std::pair<std::string, std::string> > &) const {}
 
 	boost::weak_ptr<const Film> _film;
 
@@ -167,12 +175,12 @@ protected:
 
 	/** Paths of our data files */
 	std::vector<boost::filesystem::path> _paths;
-	
+
 private:
 	std::string _digest;
 	DCPTime _position;
-	DCPTime _trim_start;
-	DCPTime _trim_end;
+	ContentTime _trim_start;
+	ContentTime _trim_end;
 	bool _change_signals_frequent;
 };