X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_ring_buffers.h;h=289a38149146c2f27fae90f98f42e9980de41504;hb=d60fd90a6e13c727a05b629c8c4b93d4bf3b717b;hp=e33d9be3b14fbbcd9ce14ce55555bf9b8de36ae6;hpb=9cd945ecca927ab49e0f9060f25515fea768acba;p=dcpomatic.git

diff --git a/src/lib/text_ring_buffers.h b/src/lib/text_ring_buffers.h
index e33d9be3b..289a38149 100644
--- a/src/lib/text_ring_buffers.h
+++ b/src/lib/text_ring_buffers.h
@@ -18,18 +18,38 @@
 
 */
 
+#ifndef DCPOMATIC_TEXT_RING_BUFFERS_H
+#define DCPOMATIC_TEXT_RING_BUFFERS_H
+
 #include "player_text.h"
+#include "dcp_text_track.h"
 #include <boost/thread.hpp>
 #include <utility>
 
 class TextRingBuffers
 {
 public:
-	void put (std::pair<PlayerText, DCPTimePeriod> text);
-	boost::optional<std::pair<PlayerText, DCPTimePeriod> > get ();
+	void put (PlayerText text, DCPTextTrack track, DCPTimePeriod period);
+
+	struct Data {
+		Data (PlayerText text_, DCPTextTrack track_, DCPTimePeriod period_)
+			: text (text_)
+			, track (track_)
+			, period (period_)
+		{}
+
+		PlayerText text;
+		DCPTextTrack track;
+		DCPTimePeriod period;
+	};
+
+	boost::optional<Data> get ();
 	void clear ();
 
 private:
 	boost::mutex _mutex;
-	std::list<std::pair<PlayerText, DCPTimePeriod> > _data;
+
+	std::list<Data> _data;
 };
+
+#endif