X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=00c2486e7e430e094ab1fcbdfc5def77cb70c29f;hb=45b0314b61c3c3b588648fb410f82546a4e5b40c;hp=dd1dd3ff2f9f689d374a5e45d204d00ba325d3d2;hpb=ff3b9789a0e0540f7a8677ec5eb644e21b6f262c;p=dcpomatic.git diff --git a/src/lib/hints.h b/src/lib/hints.h index dd1dd3ff2..00c2486e7 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. @@ -21,6 +21,7 @@ #include "signaller.h" #include "player_text.h" #include "types.h" +#include "dcp_text_track.h" #include "dcpomatic_time.h" #include #include @@ -32,7 +33,7 @@ class Film; class Hints : public Signaller { public: - Hints (explicit boost::weak_ptr film); + explicit Hints (boost::weak_ptr film); ~Hints (); void start (); @@ -44,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; @@ -54,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; };