projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; variable renaming.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.cc
diff --git
a/src/lib/subtitle_content.cc
b/src/lib/subtitle_content.cc
index f03968d91db3cfbc134bf7c54fb5277a605ff0d0..514ee03cb276e69aaffac87bbde5429b9a5d1ce0 100644
(file)
--- a/
src/lib/subtitle_content.cc
+++ b/
src/lib/subtitle_content.cc
@@
-43,8
+43,8
@@
int const SubtitleContentProperty::USE_SUBTITLES = 504;
int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
int const SubtitleContentProperty::FONTS = 506;
int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
int const SubtitleContentProperty::FONTS = 506;
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
- : Content (f)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f
ilm
)
+ : Content (f
ilm
)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
@@
-54,8
+54,8
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
}
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f
ilm
, boost::filesystem::path p)
+ : Content (f
ilm
, p)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
@@
-65,8
+65,8
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
}
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f
ilm
, cxml::ConstNodePtr node, int version)
+ : Content (f
ilm
, node)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
, _use_subtitles (false)
, _subtitle_x_offset (0)
, _subtitle_y_offset (0)
@@
-103,8
+103,8
@@
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
connect_to_fonts ();
}
connect_to_fonts ();
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : Content (f, c)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f
ilm
, vector<shared_ptr<Content> > c)
+ : Content (f
ilm
, c)
{
shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
DCPOMATIC_ASSERT (ref);
{
shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
DCPOMATIC_ASSERT (ref);