X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=b74b8bd71df42843909cba2ff98210f2e647ff8d;hb=dd7c63112eda87f2e491261873075acff114396b;hp=6f0e533d407ae4d3dd549898688c74be2d4a11e5;hpb=755b9af051c73dae5fffbe613fc45d9fd4fbd08d;p=dcpomatic.git

diff --git a/src/lib/hints.h b/src/lib/hints.h
index 6f0e533d4..b74b8bd71 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,12 +25,13 @@
 #include "dcpomatic_time.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
+#include <boost/atomic.hpp>
 #include <vector>
 #include <string>
 
 class Film;
 
-class Hints : public Signaller
+class Hints : public Signaller, public ExceptionStore
 {
 public:
 	explicit Hints (boost::weak_ptr<const Film> film);
@@ -46,16 +47,15 @@ public:
 private:
 	void thread ();
 	void hint (std::string h);
-	void text (PlayerText text, TextType type, DCPTimePeriod period);
+	void text (PlayerText text, TextType type, dcpomatic::DCPTimePeriod period);
 
 	boost::weak_ptr<const Film> _film;
-	boost::thread* _thread;
+	boost::thread _thread;
 
 	bool _long_ccap;
 	bool _overlap_ccap;
 	bool _too_many_ccap_lines;
-	boost::optional<DCPTimePeriod> _last;
+	boost::optional<dcpomatic::DCPTimePeriod> _last;
 
-	boost::mutex _mutex;
-	bool _stop;
+	boost::atomic<bool> _stop;
 };