summaryrefslogtreecommitdiff
path: root/src/lib/content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-19 09:25:33 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-19 09:25:33 +0100
commit53eea12d3e0d7925d5949de92859bc358ee0adcc (patch)
treeaf933c37720c0c68f4911b73fb22e289da990682 /src/lib/content.cc
parentdfce73ef2de0d912507a0d7819f8b469202852f5 (diff)
No-op; variable renaming.
Diffstat (limited to 'src/lib/content.cc')
-rw-r--r--src/lib/content.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9a7cb0f34..2ee660b7f 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 ())