X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=e9a75fb14dabc17664d2451ca8bf5c9d71cae479;hb=89ec77ff82b231445f2c5a4cf50d86e6cd910332;hp=b8bc806c010f8cb103d84d25931f0f06218ba40d;hpb=3c6e58b9e1430c6cbf3f28f4fd15a885aba5a237;p=dcpomatic.git diff --git a/src/lib/hints.h b/src/lib/hints.h index b8bc806c0..e9a75fb14 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -30,7 +30,7 @@ class Film; -class Hints : public Signaller +class Hints : public Signaller, public ExceptionStore { public: explicit Hints (boost::weak_ptr film); @@ -45,9 +45,8 @@ 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 _film; boost::thread* _thread; @@ -55,5 +54,8 @@ private: bool _long_ccap; bool _overlap_ccap; bool _too_many_ccap_lines; - boost::optional _last; + boost::optional _last; + + boost::mutex _mutex; + bool _stop; };