projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bugs in thread termination causing occasional pthread
[dcpomatic.git]
/
src
/
lib
/
j2k_encoder.cc
diff --git
a/src/lib/j2k_encoder.cc
b/src/lib/j2k_encoder.cc
index d8d8209c91145f78f2039f84ec1f9fb009df0a5c..4e2a30ef722cd7a45bcf42dc27c84b90da497a1d 100644
(file)
--- a/
src/lib/j2k_encoder.cc
+++ b/
src/lib/j2k_encoder.cc
@@
-64,14
+64,7
@@
J2KEncoder::J2KEncoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
J2KEncoder::~J2KEncoder ()
{
J2KEncoder::~J2KEncoder ()
{
- try {
- terminate_threads ();
- } catch (...) {
- /* Destructors must not throw exceptions; anything bad
- happening now is too late to worry about anyway,
- I think.
- */
- }
+ terminate_threads ();
}
void
}
void
@@
-246,6
+239,8
@@
J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time)
void
J2KEncoder::terminate_threads ()
{
void
J2KEncoder::terminate_threads ()
{
+ boost::this_thread::disable_interruption dis;
+
if (!_threads) {
return;
}
if (!_threads) {
return;
}