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

diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index 3586ab648..ba727cc41 100644
--- 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 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>();
+		return optional<Data>();
 	}
 
-	pair<PlayerText, DCPTimePeriod> r = _data.front ();
+	Data r = _data.front ();
 	_data.pop_front ();
 	return r;
 }