Use dcp::file_to_string().

[dcpomatic.git] / src / lib / text_ring_buffers.cc

diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index ba727cc41c4154a62c4a9868db213a6abaedd9aa..e2be7bf418a86b9fec1fc157f08a8a39c813f688 100644 (file)
--- 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 ()
 {