X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_ring_buffers.cc;h=e2be7bf418a86b9fec1fc157f08a8a39c813f688;hp=3586ab648db074a9f10ee1e91479667da478bd24;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=9cd945ecca927ab49e0f9060f25515fea768acba

diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index 3586ab648..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,31 +18,37 @@
 
 */
 
+
 #include "text_ring_buffers.h"
 
+
 using std::pair;
 using boost::optional;
+using namespace dcpomatic;
+
 
 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>();
+	if (_data.empty()) {
+		return {};
 	}
 
-	pair<PlayerText, DCPTimePeriod> r = _data.front ();
-	_data.pop_front ();
+	auto r = _data.front();
+	_data.pop_front();
 	return r;
 }
 
+
 void
 TextRingBuffers::clear ()
 {