Nicer fix for 2D-labelled-3D checking from master.

[dcpomatic.git] / src / lib / hints.h

diff --git a/src/lib/hints.h b/src/lib/hints.h
index 6f0e533d407ae4d3dd549898688c74be2d4a11e5..db7ee49b60007bf12f0ab5336df9efb409f36ce5 100644 (file)
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -30,7 +30,7 @@
 
 class Film;
 
-class Hints : public Signaller
+class Hints : public Signaller, public ExceptionStore
 {
 public:
        explicit Hints (boost::weak_ptr<const Film> film);
@@ -46,16 +46,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;
 };