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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 0db93d5e3..1fb4681a2 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -24,55 +24,116 @@
 #include "util.h"
 #include "content_factory.h"
 #include "ui_signaller.h"
+#include "exceptions.h"
+#include "film.h"
+
+#include "i18n.h"
 
 using std::string;
+using std::stringstream;
 using std::set;
+using std::list;
+using std::cout;
+using std::vector;
 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)
 	: _film (f)
-	, _start (s)
+	, _position (0)
+	, _trim_start (0)
+	, _trim_end (0)
 	, _change_signals_frequent (false)
 {
 
 }
 
-Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
+Content::Content (shared_ptr<const Film> f, DCPTime p)
 	: _film (f)
-	, _file (p)
-	, _start (0)
+	, _position (p)
+	, _trim_start (0)
+	, _trim_end (0)
 	, _change_signals_frequent (false)
 {
 
 }
 
+Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
+	: _film (f)
+	, _position (0)
+	, _trim_start (0)
+	, _trim_end (0)
+	, _change_signals_frequent (false)
+{
+	_paths.push_back (p);
+}
+
 Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: _film (f)
 	, _change_signals_frequent (false)
 {
-	_file = node->string_child ("File");
+	list<cxml::NodePtr> path_children = node->node_children ("Path");
+	for (list<cxml::NodePtr>::const_iterator i = path_children.begin(); i != path_children.end(); ++i) {
+		_paths.push_back ((*i)->content ());
+	}
 	_digest = node->string_child ("Digest");
-	_start = node->number_child<Time> ("Start");
+	_position = DCPTime (node->number_child<double> ("Position"));
+	_trim_start = DCPTime (node->number_child<double> ("TrimStart"));
+	_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
+}
+
+Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+	: _film (f)
+	, _position (c.front()->position ())
+	, _trim_start (c.front()->trim_start ())
+	, _trim_end (c.back()->trim_end ())
+	, _change_signals_frequent (false)
+{
+	for (size_t i = 0; i < c.size(); ++i) {
+		if (i > 0 && c[i]->trim_start() > DCPTime()) {
+			throw JoinError (_("Only the first piece of content to be joined can have a start trim."));
+		}
+
+		if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) {
+			throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
+		}
+
+		for (size_t j = 0; j < c[i]->number_of_paths(); ++j) {
+			_paths.push_back (c[i]->path (j));
+		}
+	}
 }
 
 void
 Content::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	node->add_child("File")->add_child_text (_file.string());
+
+	for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
+		node->add_child("Path")->add_child_text (i->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.get ()));
+	node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start.get ()));
+	node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end.get ()));
 }
 
 void
-Content::examine (shared_ptr<Job>)
+Content::examine (shared_ptr<Job> job)
 {
-	string const d = md5_digest (_file);
 	boost::mutex::scoped_lock lm (_mutex);
+	vector<boost::filesystem::path> p = _paths;
+	lm.unlock ();
+	
+	string const d = md5_digest (p, job);
+
+	lm.lock ();
 	_digest = d;
 }
 
@@ -85,16 +146,43 @@ Content::signal_changed (int p)
 }
 
 void
-Content::set_start (Time s)
+Content::set_position (DCPTime p)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (p == _position) {
+			return;
+		}
+		
+		_position = p;
+	}
+
+	signal_changed (ContentProperty::POSITION);
+}
+
+void
+Content::set_trim_start (DCPTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_start = s;
+		_trim_start = t;
 	}
 
-	signal_changed (ContentProperty::START);
+	signal_changed (ContentProperty::TRIM_START);
 }
 
+void
+Content::set_trim_end (DCPTime t)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_trim_end = t;
+	}
+
+	signal_changed (ContentProperty::TRIM_END);
+}
+
+
 shared_ptr<Content>
 Content::clone () const
 {
@@ -107,11 +195,71 @@ 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)));
+
+	/* notes is unused here (we assume) */
+	list<string> notes;
+	return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version, notes);
 }
 
 string
 Content::technical_summary () const
 {
-	return String::compose ("%1 %2 %3", file(), digest(), start());
+	return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+}
+
+DCPTime
+Content::length_after_trim () const
+{
+	return full_length() - trim_start() - trim_end();
+}
+
+/** @return string which includes everything about how this content affects
+ *  its playlist.
+ */
+string
+Content::identifier () const
+{
+	stringstream s;
+	
+	s << Content::digest()
+	  << "_" << position().get()
+	  << "_" << trim_start().get()
+	  << "_" << trim_end().get();
+
+	return s.str ();
+}
+
+bool
+Content::paths_valid () const
+{
+	for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
+		if (!boost::filesystem::exists (*i)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void
+Content::set_path (boost::filesystem::path path)
+{
+	_paths.clear ();
+	_paths.push_back (path);
+	signal_changed (ContentProperty::PATH);
+}
+
+string
+Content::path_summary () const
+{
+	/* XXX: should handle multiple paths more gracefully */
+
+	assert (number_of_paths ());
+
+	string s = path(0).filename().string ();
+	if (number_of_paths() > 1) {
+		s += " ...";
+	}
+
+	return s;
 }