summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-10-14 16:50:32 +0200
committerCarl Hetherington <cth@carlh.net>2025-10-15 22:33:26 +0200
commitc5cef18516fae464c6c6c9c79e3c557eb342b02f (patch)
tree4ae7483503682150925d7be7467043e2967eeede
parent7254d43d8283b82d4d100e78bd3fd8026e5e68ed (diff)
White space: ffmpeg_subtitle_stream.{cc,h}
-rw-r--r--src/lib/ffmpeg_subtitle_stream.cc20
-rw-r--r--src/lib/ffmpeg_subtitle_stream.h10
2 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 5a5655088..6b671236c 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -35,13 +35,13 @@ using std::make_pair;
* @param node String returned from to_string().
* @param version State file version.
*/
-FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version)
- : FFmpegStream (node)
+FFmpegSubtitleStream::FFmpegSubtitleStream(cxml::ConstNodePtr node, int version)
+ : FFmpegStream(node)
{
if (version >= 33) {
- boost::mutex::scoped_lock lm (_mutex);
- for (auto i: node->node_children ("Colour")) {
- _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
+ boost::mutex::scoped_lock lm(_mutex);
+ for (auto i: node->node_children("Colour")) {
+ _colours[RGBA(i->node_child("From"))] = RGBA(i->node_child("To"));
}
}
}
@@ -51,7 +51,7 @@ FFmpegSubtitleStream::as_xml(xmlpp::Element* root) const
{
FFmpegStream::as_xml(root);
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm(_mutex);
for (map<RGBA, RGBA>::const_iterator i = _colours.begin(); i != _colours.end(); ++i) {
auto node = cxml::add_child(root, "Colour");
i->first.as_xml(cxml::add_child(node, "From"));
@@ -60,15 +60,15 @@ FFmpegSubtitleStream::as_xml(xmlpp::Element* root) const
}
map<RGBA, RGBA>
-FFmpegSubtitleStream::colours () const
+FFmpegSubtitleStream::colours() const
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm(_mutex);
return _colours;
}
void
-FFmpegSubtitleStream::set_colour (RGBA from, RGBA to)
+FFmpegSubtitleStream::set_colour(RGBA from, RGBA to)
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm(_mutex);
_colours[from] = to;
}
diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 6251350ce..614a014e6 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -27,16 +27,16 @@
class FFmpegSubtitleStream : public FFmpegStream
{
public:
- FFmpegSubtitleStream (std::string n, int i)
- : FFmpegStream (n, i)
+ FFmpegSubtitleStream(std::string n, int i)
+ : FFmpegStream(n, i)
{}
- FFmpegSubtitleStream (cxml::ConstNodePtr node, int version);
+ FFmpegSubtitleStream(cxml::ConstNodePtr node, int version);
void as_xml(xmlpp::Element*) const;
- void set_colour (RGBA from, RGBA to);
- std::map<RGBA, RGBA> colours () const;
+ void set_colour(RGBA from, RGBA to);
+ std::map<RGBA, RGBA> colours() const;
private:
/** mutex to protect _colours as it can be set from the "examine FFmpeg subtitles" job thread */