diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
| commit | 8963f0007af1a312017b9627c18b82ec2a577591 (patch) | |
| tree | baeb6f2c17da72248408b8c1d695242b44edda9e /src/lib/text_ring_buffers.cc | |
| parent | 29f84e2b8785585885e0658bdf9938967547460f (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/text_ring_buffers.cc')
| -rw-r--r-- | src/lib/text_ring_buffers.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc index ba727cc41..e2be7bf41 100644 --- a/src/lib/text_ring_buffers.cc +++ b/src/lib/text_ring_buffers.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,12 +18,15 @@ */ + #include "text_ring_buffers.h" + using std::pair; using boost::optional; using namespace dcpomatic; + void TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period) { @@ -31,19 +34,21 @@ TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period) _data.push_back (Data(text, track, period)); } + optional<TextRingBuffers::Data> TextRingBuffers::get () { boost::mutex::scoped_lock lm (_mutex); - if (_data.empty ()) { - return optional<Data>(); + if (_data.empty()) { + return {}; } - Data r = _data.front (); - _data.pop_front (); + auto r = _data.front(); + _data.pop_front(); return r; } + void TextRingBuffers::clear () { |