projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change end() to only do one thing, and copy the required stuff into pause()
[dcpomatic.git]
/
src
/
lib
/
text_ring_buffers.cc
diff --git
a/src/lib/text_ring_buffers.cc
b/src/lib/text_ring_buffers.cc
index cc5357804bb0eccfccede815f9c8105f90bc4643..e2be7bf418a86b9fec1fc157f08a8a39c813f688 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-18,10
+18,14
@@
*/
*/
+
#include "text_ring_buffers.h"
#include "text_ring_buffers.h"
+
using std::pair;
using boost::optional;
using std::pair;
using boost::optional;
+using namespace dcpomatic;
+
void
TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
void
TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
@@
-30,19
+34,21
@@
TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
_data.push_back (Data(text, track, period));
}
_data.push_back (Data(text, track, period));
}
+
optional<TextRingBuffers::Data>
TextRingBuffers::get ()
{
boost::mutex::scoped_lock lm (_mutex);
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;
}
return r;
}
+
void
TextRingBuffers::clear ()
{
void
TextRingBuffers::clear ()
{