X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=aa382d68b9e5f53fa233e70a6d4925ae65a73b9e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=9a7cb0f34f68e0837862bbc96bc36aca00ab6d27;hpb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9a7cb0f34..aa382d68b 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -48,8 +48,8 @@ int const ContentProperty::LENGTH = 402;
 int const ContentProperty::TRIM_START = 403;
 int const ContentProperty::TRIM_END = 404;
 
-Content::Content (shared_ptr<const Film> f)
-	: _film (f)
+Content::Content (shared_ptr<const Film> film)
+	: _film (film)
 	, _position (0)
 	, _trim_start (0)
 	, _trim_end (0)
@@ -58,8 +58,8 @@ Content::Content (shared_ptr<const Film> f)
 
 }
 
-Content::Content (shared_ptr<const Film> f, DCPTime p)
-	: _film (f)
+Content::Content (shared_ptr<const Film> film, DCPTime p)
+	: _film (film)
 	, _position (p)
 	, _trim_start (0)
 	, _trim_end (0)
@@ -68,8 +68,8 @@ Content::Content (shared_ptr<const Film> f, DCPTime p)
 
 }
 
-Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
-	: _film (f)
+Content::Content (shared_ptr<const Film> film, boost::filesystem::path p)
+	: _film (film)
 	, _position (0)
 	, _trim_start (0)
 	, _trim_end (0)
@@ -78,8 +78,8 @@ Content::Content (shared_ptr<const Film> f, boost::filesystem::path p)
 	_paths.push_back (p);
 }
 
-Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
-	: _film (f)
+Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
+	: _film (film)
 	, _change_signals_frequent (false)
 {
 	list<cxml::NodePtr> path_children = node->node_children ("Path");
@@ -92,8 +92,8 @@ Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
 	_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
 }
 
-Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-	: _film (f)
+Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+	: _film (film)
 	, _position (c.front()->position ())
 	, _trim_start (c.front()->trim_start ())
 	, _trim_end (c.back()->trim_end ())
@@ -134,7 +134,7 @@ Content::examine (shared_ptr<Job> job)
 	if (job) {
 		job->sub (_("Computing digest"));
 	}
-	
+
 	boost::mutex::scoped_lock lm (_mutex);
 	vector<boost::filesystem::path> p = _paths;
 	lm.unlock ();
@@ -163,7 +163,7 @@ Content::set_position (DCPTime p)
 		if (p == _position) {
 			return;
 		}
-		
+
 		_position = p;
 	}
 
@@ -200,7 +200,7 @@ Content::clone () const
 	if (!film) {
 		return shared_ptr<Content> ();
 	}
-	
+
 	/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
 	xmlpp::Document doc;
 	xmlpp::Node* node = doc.create_root_node ("Content");
@@ -230,7 +230,7 @@ string
 Content::identifier () const
 {
 	SafeStringStream s;
-	
+
 	s << Content::digest()
 	  << "_" << position().get()
 	  << "_" << trim_start().get()