projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing noncopyable.
[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 3586ab648db074a9f10ee1e91479667da478bd24..ba727cc41c4154a62c4a9868db213a6abaedd9aa 100644
(file)
--- a/
src/lib/text_ring_buffers.cc
+++ b/
src/lib/text_ring_buffers.cc
@@
-22,23
+22,24
@@
using std::pair;
using boost::optional;
using std::pair;
using boost::optional;
+using namespace dcpomatic;
void
void
-TextRingBuffers::put (
pair<PlayerText, DCPTimePeriod> text
)
+TextRingBuffers::put (
PlayerText text, DCPTextTrack track, DCPTimePeriod period
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- _data.push_back (
text
);
+ _data.push_back (
Data(text, track, period)
);
}
}
-optional<
pair<PlayerText, DCPTimePeriod>
>
+optional<
TextRingBuffers::Data
>
TextRingBuffers::get ()
{
boost::mutex::scoped_lock lm (_mutex);
if (_data.empty ()) {
TextRingBuffers::get ()
{
boost::mutex::scoped_lock lm (_mutex);
if (_data.empty ()) {
- return
pair<PlayerText, DCPTimePeriod
>();
+ return
optional<Data
>();
}
}
-
pair<PlayerText, DCPTimePeriod>
r = _data.front ();
+
Data
r = _data.front ();
_data.pop_front ();
return r;
}
_data.pop_front ();
return r;
}