X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=b74b8bd71df42843909cba2ff98210f2e647ff8d;hb=f525fad0c38e198f35055e639184fa983a3d5d56;hp=dd1dd3ff2f9f689d374a5e45d204d00ba325d3d2;hpb=ff3b9789a0e0540f7a8677ec5eb644e21b6f262c;p=dcpomatic.git

diff --git a/src/lib/hints.h b/src/lib/hints.h
index dd1dd3ff2..b74b8bd71 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,18 +21,20 @@
 #include "signaller.h"
 #include "player_text.h"
 #include "types.h"
+#include "dcp_text_track.h"
 #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:
-	Hints (explicit boost::weak_ptr<const Film> film);
+	explicit Hints (boost::weak_ptr<const Film> film);
 	~Hints ();
 
 	void start ();
@@ -44,15 +46,16 @@ public:
 
 private:
 	void thread ();
-	void stop_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::atomic<bool> _stop;
 };