projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More player debugging for butler video-full states.
[dcpomatic.git]
/
src
/
lib
/
hints.h
diff --git
a/src/lib/hints.h
b/src/lib/hints.h
index dd1dd3ff2f9f689d374a5e45d204d00ba325d3d2..6f0e533d407ae4d3dd549898688c74be2d4a11e5 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
-2019
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-21,6
+21,7
@@
#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>
@@
-32,7
+33,7
@@
class Film;
class Hints : public Signaller
{
public:
class Hints : public Signaller
{
public:
-
Hints (explicit
boost::weak_ptr<const Film> film);
+
explicit Hints (
boost::weak_ptr<const Film> film);
~Hints ();
void start ();
~Hints ();
void start ();
@@
-44,7
+45,6
@@
public:
private:
void thread ();
private:
void thread ();
- void stop_thread ();
void hint (std::string h);
void text (PlayerText text, TextType type, DCPTimePeriod period);
void hint (std::string h);
void text (PlayerText text, TextType type, DCPTimePeriod period);
@@
-55,4
+55,7
@@
private:
bool _overlap_ccap;
bool _too_many_ccap_lines;
boost::optional<DCPTimePeriod> _last;
bool _overlap_ccap;
bool _too_many_ccap_lines;
boost::optional<DCPTimePeriod> _last;
+
+ boost::mutex _mutex;
+ bool _stop;
};
};