summaryrefslogtreecommitdiff
path: root/src/lib/encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-19 15:41:41 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-19 15:41:41 +0100
commit11325f810e214935e4115248223c186a6e4cc184 (patch)
treeb529056e5f0001cccb0621f31a3bed5d4f43e2da /src/lib/encoder.cc
parent6543d9a51b31ce24726187d9d1b018f05f09ef40 (diff)
Some improvements in progress reporting, especially for long jobs.
Diffstat (limited to 'src/lib/encoder.cc')
-rw-r--r--src/lib/encoder.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 35ebfb52e..924a91439 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -52,7 +52,6 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
: _film (f)
, _job (j)
, _video_frames_out (0)
- , _state (TRANSCODING)
, _terminate (false)
{
_have_a_real_frame[EYES_BOTH] = false;
@@ -125,11 +124,6 @@ Encoder::process_end ()
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
}
}
-
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _state = HASHING;
- }
_writer->finish ();
_writer.reset ();