projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
text_content.h
diff --git
a/src/lib/text_content.h
b/src/lib/text_content.h
index d3e9b564b389fcb8787397ff43cefd6660ae1382..66bedecf51007c9e030cf3f01d3261ecc5eb5dfa 100644
(file)
--- a/
src/lib/text_content.h
+++ b/
src/lib/text_content.h
@@
-132,7
+132,7
@@
public:
return _y_scale;
}
return _y_scale;
}
- std::list<std::shared_ptr<dcpomatic::Font>
> fonts () const {
+ std::list<std::shared_ptr<dcpomatic::Font>> fonts () const {
boost::mutex::scoped_lock lm (_mutex);
return _fonts;
}
boost::mutex::scoped_lock lm (_mutex);
return _fonts;
}
@@
-221,7
+221,7
@@
private:
double _x_scale;
/** y scale factor to apply to subtitles */
double _y_scale;
double _x_scale;
/** y scale factor to apply to subtitles */
double _y_scale;
- std::list<std::shared_ptr<dcpomatic::Font>
> _fonts;
+ std::list<std::shared_ptr<dcpomatic::Font>> _fonts;
boost::optional<dcp::Colour> _colour;
boost::optional<dcp::Effect> _effect;
boost::optional<dcp::Colour> _effect_colour;
boost::optional<dcp::Colour> _colour;
boost::optional<dcp::Effect> _effect;
boost::optional<dcp::Colour> _effect_colour;