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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 1fb4681a2..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;
@@ -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)
 {
@@ -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.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 ()));
+	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
@@ -210,7 +216,7 @@ Content::technical_summary () const
 DCPTime
 Content::length_after_trim () const
 {
-	return full_length() - trim_start() - trim_end();
+	return max (DCPTime (), full_length() - trim_start() - trim_end());
 }
 
 /** @return string which includes everything about how this content affects