projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't crash if history items are inaccessible.
[dcpomatic.git]
/
src
/
lib
/
hints.h
diff --git
a/src/lib/hints.h
b/src/lib/hints.h
index 67cada89f49bee1e58b9489e5b032e64815eff2f..00c2486e7e430e094ab1fcbdfc5def77cb70c29f 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>
@@
-44,9
+45,8
@@
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::thread* _thread;
boost::weak_ptr<const Film> _film;
boost::thread* _thread;
@@
-54,5
+54,8
@@
private:
bool _long_ccap;
bool _overlap_ccap;
bool _too_many_ccap_lines;
bool _long_ccap;
bool _overlap_ccap;
bool _too_many_ccap_lines;
- boost::optional<DCPTimePeriod> _last;
+ boost::optional<dcpomatic::DCPTimePeriod> _last;
+
+ boost::mutex _mutex;
+ bool _stop;
};
};