diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-08 20:37:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-08 20:37:53 +0100 |
| commit | fd040c2bd27fde35424a384174ecb56c643764cd (patch) | |
| tree | 074906414d27d93a21224f110129a7e857a6ee04 /src/lib/encoder.cc | |
| parent | 72d36df1174810d8d871a06d085b81b1652edf67 (diff) | |
Some tidying up. Do encode progress in the writer to improve progress bar movement with still-image DCPs (#130).
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index c1d1041ae..d25e0d0f8 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -55,8 +55,9 @@ using boost::optional; int const Encoder::_history_size = 25; /** @param f Film that we are encoding */ -Encoder::Encoder (shared_ptr<Film> f) +Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j) : _film (f) + , _job (j) , _video_frames_in (0) , _video_frames_out (0) #ifdef HAVE_SWRESAMPLE @@ -127,7 +128,7 @@ Encoder::process_begin () } } - _writer.reset (new Writer (_film)); + _writer.reset (new Writer (_film, _job)); } |