X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=a41261998671d3083f54c3fd5c921ddeba7de89e;hb=cadf2d574d144098fffa3c61e0a2be88f496cac6;hp=0db93d5e358622a33f4aa73127e2e30ff7b5331d;hpb=38fda7888663429d452b9c71902e8bb5239dd720;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 0db93d5e3..a41261998 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -26,16 +26,22 @@
 #include "ui_signaller.h"
 
 using std::string;
+using std::stringstream;
 using std::set;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-int const ContentProperty::START = 400;
-int const ContentProperty::LENGTH = 401;
+int const ContentProperty::PATH = 400;
+int const ContentProperty::POSITION = 401;
+int const ContentProperty::LENGTH = 402;
+int const ContentProperty::TRIM_START = 403;
+int const ContentProperty::TRIM_END = 404;
 
-Content::Content (shared_ptr<const Film> f, Time s)
+Content::Content (shared_ptr<const Film> f, Time p)
 	: _film (f)
-	, _start (s)
+	, _position (p)
+	, _trim_start (0)
+	, _trim_end (0)
 	, _change_signals_frequent (false)
 {
 
@@ -43,8 +49,10 @@ Content::Content (shared_ptr<const Film> f, Time s)
 
 Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
 	: _film (f)
-	, _file (p)
-	, _start (0)
+	, _path (p)
+	, _position (0)
+	, _trim_start (0)
+	, _trim_end (0)
 	, _change_signals_frequent (false)
 {
 
@@ -54,25 +62,40 @@ Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: _film (f)
 	, _change_signals_frequent (false)
 {
-	_file = node->string_child ("File");
+	_path = node->string_child ("Path");
 	_digest = node->string_child ("Digest");
-	_start = node->number_child<Time> ("Start");
+	_position = node->number_child<Time> ("Position");
+	_trim_start = node->number_child<Time> ("TrimStart");
+	_trim_end = node->number_child<Time> ("TrimEnd");
 }
 
 void
 Content::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	node->add_child("File")->add_child_text (_file.string());
+	
+	node->add_child("Path")->add_child_text (_path.string());
 	node->add_child("Digest")->add_child_text (_digest);
-	node->add_child("Start")->add_child_text (lexical_cast<string> (_start));
+	node->add_child("Position")->add_child_text (lexical_cast<string> (_position));
+	node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start));
+	node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end));
 }
 
 void
-Content::examine (shared_ptr<Job>)
+Content::examine (shared_ptr<Job> job)
 {
-	string const d = md5_digest (_file);
 	boost::mutex::scoped_lock lm (_mutex);
+	boost::filesystem::path p = _path;
+	lm.unlock ();
+	
+	string d;
+	if (boost::filesystem::is_regular_file (p)) {
+		d = md5_digest (p);
+	} else {
+		d = md5_digest_directory (p, job);
+	}
+
+	lm.lock ();
 	_digest = d;
 }
 
@@ -85,16 +108,39 @@ Content::signal_changed (int p)
 }
 
 void
-Content::set_start (Time s)
+Content::set_position (Time p)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_start = s;
+		_position = p;
 	}
 
-	signal_changed (ContentProperty::START);
+	signal_changed (ContentProperty::POSITION);
 }
 
+void
+Content::set_trim_start (Time t)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_trim_start = t;
+	}
+
+	signal_changed (ContentProperty::TRIM_START);
+}
+
+void
+Content::set_trim_end (Time t)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_trim_end = t;
+	}
+
+	signal_changed (ContentProperty::TRIM_END);
+}
+
+
 shared_ptr<Content>
 Content::clone () const
 {
@@ -107,11 +153,57 @@ Content::clone () const
 	xmlpp::Document doc;
 	xmlpp::Node* node = doc.create_root_node ("Content");
 	as_xml (node);
-	return content_factory (film, shared_ptr<cxml::Node> (new cxml::Node (node)));
+	return content_factory (film, cxml::NodePtr(new cxml::Node (node)));
 }
 
 string
 Content::technical_summary () const
 {
-	return String::compose ("%1 %2 %3", file(), digest(), start());
+	return String::compose ("%1 %2 %3", path(), digest(), position());
 }
+
+Time
+Content::length_after_trim () const
+{
+	return full_length() - trim_start() - trim_end();
+}
+
+/** @param t A time relative to the start of this content (not the position).
+ *  @return true if this time is trimmed by our trim settings.
+ */
+bool
+Content::trimmed (Time t) const
+{
+	return (t < trim_start() || t > (full_length() - trim_end ()));
+}
+
+/** @return string which includes everything about how this content affects
+ *  its playlist.
+ */
+string
+Content::identifier () const
+{
+	stringstream s;
+	
+	s << Content::digest()
+	  << "_" << position()
+	  << "_" << trim_start()
+	  << "_" << trim_end();
+
+	return s.str ();
+}
+
+bool
+Content::path_valid () const
+{
+	return boost::filesystem::exists (_path);
+}
+
+void
+Content::set_path (boost::filesystem::path path)
+{
+	_path = path;
+	signal_changed (ContentProperty::PATH);
+}
+
+