X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=d87ae13d7fee53739f8a5d8ecb1173d177654929;hb=d8a19dca28268e3ac92f117d00c1064c0b06515c;hp=a3e6da988cddad6fa335a89d60814c1f69f56b83;hpb=92fcfff515d8416c8b175cb5e68dd492963362d5;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index a3e6da988..d87ae13d7 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,14 +25,19 @@
 #define DCPOMATIC_CONTENT_H
 
 #include "types.h"
+#include "signaller.h"
 #include "dcpomatic_time.h"
-#include <libxml++/libxml++.h>
+#include "raw_convert.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 +58,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>);
@@ -66,23 +71,26 @@ public:
 	/** Examine the content to establish digest, frame rates and any other
 	 *  useful metadata.
 	 *  @param job Job to use to report progress, or 0.
-	 *  @param calculate_digest True to calculate a digest for the content's file(s).
 	 */
-	virtual void examine (boost::shared_ptr<Job> job, bool calculate_digest);
-	
+	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;
+	/** @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;
 
@@ -104,11 +112,14 @@ public:
 		boost::mutex::scoped_lock lm (_mutex);
 		return _paths[i];
 	}
-	
+
 	bool paths_valid () const;
 
-	/** @return MD5 digest of the content's file(s) */
-	boost::optional<std::string> digest () 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's version (see comments in ::examine).
+	 */
+	std::string digest () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _digest;
 	}
@@ -123,39 +134,59 @@ 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;
 	}
 
-	boost::shared_ptr<const Film> film () const {
-		return _film.lock ();
-	}
+	boost::shared_ptr<const Film> film () const;
+
+	class UserProperty
+	{
+	public:
+		template <class T>
+		UserProperty (std::string category_, std::string key_, T value_, std::string unit_ = "")
+			: category (category_)
+			, key (key_)
+			, value (raw_convert<std::string> (value_))
+			, unit (unit_)
+		{}
+
+		std::string category;
+		std::string key;
+		std::string value;
+		std::string unit;
+	};
+
+	std::list<UserProperty> user_properties () const;
 
 	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
 protected:
 	void signal_changed (int);
 
+	virtual void add_properties (std::list<UserProperty> &) const {}
+
 	boost::weak_ptr<const Film> _film;
 
 	/** _mutex which should be used to protect accesses, as examine
@@ -165,12 +196,12 @@ protected:
 
 	/** Paths of our data files */
 	std::vector<boost::filesystem::path> _paths;
-	
+
 private:
-	boost::optional<std::string> _digest;
+	std::string _digest;
 	DCPTime _position;
-	DCPTime _trim_start;
-	DCPTime _trim_end;
+	ContentTime _trim_start;
+	ContentTime _trim_end;
 	bool _change_signals_frequent;
 };