summaryrefslogtreecommitdiff
path: root/src/lib/text_ring_buffers.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-28 23:34:56 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-29 11:58:06 +0100
commit1db0293ad36605da9ca8daa8736ef581f4f6a34e (patch)
treefb613032d7f8a1712cf10f99ebbf6215e4145c5a /src/lib/text_ring_buffers.cc
parentec97893127a2d59871d92c9e658b6b1ab3100b40 (diff)
Basics of splitting CCAP streams into different assets.
Diffstat (limited to 'src/lib/text_ring_buffers.cc')
-rw-r--r--src/lib/text_ring_buffers.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index 3586ab648..cc5357804 100644
--- a/src/lib/text_ring_buffers.cc
+++ b/src/lib/text_ring_buffers.cc
@@ -24,21 +24,21 @@ using std::pair;
using boost::optional;
void
-TextRingBuffers::put (pair<PlayerText, DCPTimePeriod> text)
+TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
{
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 ()) {
- return pair<PlayerText, DCPTimePeriod>();
+ return optional<Data>();
}
- pair<PlayerText, DCPTimePeriod> r = _data.front ();
+ Data r = _data.front ();
_data.pop_front ();
return r;
}