X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=bbbe9b6ce4bdd4dd5ff6b8dcf231c8d08126e253;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=f09012765a7cbe7616d1e2ae40a870981b74604a;hpb=f0be0f0e060e40d9a0da1b44429ef41901b8a536;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index f09012765..bbbe9b6ce 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -17,9 +17,14 @@
 
 */
 
+/** @file  src/lib/content.cc
+ *  @brief Content class.
+ */
+
 #include <boost/thread/mutex.hpp>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
@@ -35,8 +40,9 @@ using std::set;
 using std::list;
 using std::cout;
 using std::vector;
+using std::max;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using dcp::raw_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -54,7 +60,7 @@ Content::Content (shared_ptr<const Film> f)
 
 }
 
-Content::Content (shared_ptr<const Film> f, Time p)
+Content::Content (shared_ptr<const Film> f, DCPTime p)
 	: _film (f)
 	, _position (p)
 	, _trim_start (0)
@@ -74,7 +80,7 @@ Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
 	_paths.push_back (p);
 }
 
-Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
 	: _film (f)
 	, _change_signals_frequent (false)
 {
@@ -83,9 +89,9 @@ Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 		_paths.push_back ((*i)->content ());
 	}
 	_digest = node->string_child ("Digest");
-	_position = node->number_child<Time> ("Position");
-	_trim_start = node->number_child<Time> ("TrimStart");
-	_trim_end = node->number_child<Time> ("TrimEnd");
+	_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)
@@ -96,11 +102,11 @@ Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
 	, _change_signals_frequent (false)
 {
 	for (size_t i = 0; i < c.size(); ++i) {
-		if (i > 0 && c[i]->trim_start ()) {
+		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 ()) {
+		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."));
 		}
 
@@ -119,9 +125,9 @@ Content::as_xml (xmlpp::Node* node) const
 		node->add_child("Path")->add_child_text (i->string ());
 	}
 	node->add_child("Digest")->add_child_text (_digest);
-	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));
+	node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ()));
+	node->add_child("TrimStart")->add_child_text (raw_convert<string> (_trim_start.get ()));
+	node->add_child("TrimEnd")->add_child_text (raw_convert<string> (_trim_end.get ()));
 }
 
 void
@@ -146,10 +152,14 @@ Content::signal_changed (int p)
 }
 
 void
-Content::set_position (Time p)
+Content::set_position (DCPTime p)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
+		if (p == _position) {
+			return;
+		}
+		
 		_position = p;
 	}
 
@@ -157,7 +167,7 @@ Content::set_position (Time p)
 }
 
 void
-Content::set_trim_start (Time t)
+Content::set_trim_start (DCPTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -168,7 +178,7 @@ Content::set_trim_start (Time t)
 }
 
 void
-Content::set_trim_end (Time t)
+Content::set_trim_end (DCPTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -191,28 +201,22 @@ Content::clone () const
 	xmlpp::Document doc;
 	xmlpp::Node* node = doc.create_root_node ("Content");
 	as_xml (node);
-	return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::state_version);
+
+	/* 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", path_summary(), digest(), position());
+	return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
 }
 
-Time
+DCPTime
 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 max (DCPTime (), full_length() - trim_start() - trim_end());
 }
 
 /** @return string which includes everything about how this content affects
@@ -224,15 +228,15 @@ Content::identifier () const
 	stringstream s;
 	
 	s << Content::digest()
-	  << "_" << position()
-	  << "_" << trim_start()
-	  << "_" << trim_end();
+	  << "_" << position().get()
+	  << "_" << trim_start().get()
+	  << "_" << trim_end().get();
 
 	return s.str ();
 }
 
 bool
-Content::path_valid () const
+Content::paths_valid () const
 {
 	for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
 		if (!boost::filesystem::exists (*i)) {