projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index ca9134c04d29e52400579330eb34d4fa75a5196e..7863859deb817d3c66f364afb3613c5175108a65 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-68,9
+68,6
@@
Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
Encoder::~Encoder ()
{
terminate_threads ();
Encoder::~Encoder ()
{
terminate_threads ();
- if (_writer) {
- _writer->finish ();
- }
}
/** Add a worker thread for a each thread on a remote server. Caller must hold
}
/** Add a worker thread for a each thread on a remote server. Caller must hold
@@
-183,6
+180,8
@@
Encoder::frame_done ()
void
Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
{
void
Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
{
+ _waker.nudge ();
+
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */