projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add DCPContent::from_libdcp_kind.
[dcpomatic.git]
/
src
/
lib
/
hints.h
diff --git
a/src/lib/hints.h
b/src/lib/hints.h
index ad66fb472a6a375137784bcfb0266cf954fb4bc5..b74b8bd71df42843909cba2ff98210f2e647ff8d 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-21,18
+21,20
@@
#include "signaller.h"
#include "player_text.h"
#include "types.h"
#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 "dcpomatic_time.h"
#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
+#include <boost/atomic.hpp>
#include <vector>
#include <string>
class Film;
#include <vector>
#include <string>
class Film;
-class Hints : public Signaller
+class Hints : public Signaller
, public ExceptionStore
{
public:
{
public:
- Hints (boost::weak_ptr<const Film> film);
+
explicit
Hints (boost::weak_ptr<const Film> film);
~Hints ();
void start ();
~Hints ();
void start ();
@@
-44,12
+46,16
@@
public:
private:
void thread ();
private:
void thread ();
- void stop_thread ();
void hint (std::string h);
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::weak_ptr<const Film> _film;
- boost::thread
*
_thread;
+ boost::thread _thread;
bool _long_ccap;
bool _long_ccap;
+ bool _overlap_ccap;
+ bool _too_many_ccap_lines;
+ boost::optional<dcpomatic::DCPTimePeriod> _last;
+
+ boost::atomic<bool> _stop;
};
};