summaryrefslogtreecommitdiff
path: root/src/lib/video_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/video_content.cc
parentdfce73ef2de0d912507a0d7819f8b469202852f5 (diff)
No-op; variable renaming.
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 60b702e01..f97e46322 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -60,8 +60,8 @@ using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
-VideoContent::VideoContent (shared_ptr<const Film> f)
- : Content (f)
+VideoContent::VideoContent (shared_ptr<const Film> film)
+ : Content (film)
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -72,8 +72,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
set_default_colour_conversion ();
}
-VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
- : Content (f, s)
+VideoContent::VideoContent (shared_ptr<const Film> film, DCPTime s, Frame len)
+ : Content (film, s)
, _video_length (len)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -84,8 +84,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, Frame len)
set_default_colour_conversion ();
}
-VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
+VideoContent::VideoContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
, _video_length (0)
, _video_frame_rate (0)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
@@ -96,8 +96,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
set_default_colour_conversion ();
}
-VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
+VideoContent::VideoContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+ : Content (film, node)
{
_video_size.width = node->number_child<int> ("VideoWidth");
_video_size.height = node->number_child<int> ("VideoHeight");
@@ -131,8 +131,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
}
}
-VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : Content (f, c)
+VideoContent::VideoContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+ : Content (film, c)
, _video_length (0)
{
shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);