X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_ring_buffers.cc;fp=src%2Flib%2Ftext_ring_buffers.cc;h=e2be7bf418a86b9fec1fc157f08a8a39c813f688;hb=8963f0007af1a312017b9627c18b82ec2a577591;hp=ba727cc41c4154a62c4a9868db213a6abaedd9aa;hpb=29f84e2b8785585885e0658bdf9938967547460f;p=dcpomatic.git

diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index ba727cc41..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,12 +18,15 @@
 
 */
 
+
 #include "text_ring_buffers.h"
 
+
 using std::pair;
 using boost::optional;
 using namespace dcpomatic;
 
+
 void
 TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
 {
@@ -31,19 +34,21 @@ TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)
 	_data.push_back (Data(text, track, period));
 }
 
+
 optional<TextRingBuffers::Data>
 TextRingBuffers::get ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	if (_data.empty ()) {
-		return optional<Data>();
+	if (_data.empty()) {
+		return {};
 	}
 
-	Data r = _data.front ();
-	_data.pop_front ();
+	auto r = _data.front();
+	_data.pop_front();
 	return r;
 }
 
+
 void
 TextRingBuffers::clear ()
 {