X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=b74b8bd71df42843909cba2ff98210f2e647ff8d;hp=67cada89f49bee1e58b9489e5b032e64815eff2f;hb=463496994d770577ff1e1ea6e7b1e4addb4252b2;hpb=8abb560971a256c0cfa9c9a3fe1d88964d593052 diff --git a/src/lib/hints.h b/src/lib/hints.h index 67cada89f..b74b8bd71 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -21,15 +21,17 @@ #include "signaller.h" #include "player_text.h" #include "types.h" +#include "dcp_text_track.h" #include "dcpomatic_time.h" #include #include +#include #include #include class Film; -class Hints : public Signaller +class Hints : public Signaller, public ExceptionStore { public: explicit Hints (boost::weak_ptr film); @@ -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 _film; - boost::thread* _thread; + boost::thread _thread; bool _long_ccap; bool _overlap_ccap; bool _too_many_ccap_lines; - boost::optional _last; + boost::optional _last; + + boost::atomic _stop; };