diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-02-08 13:07:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-02-08 13:07:16 +0000 |
| commit | 2e536ef0971edefea23810b99f7706881072783b (patch) | |
| tree | 8b96ac62795a5953e942bd6fc0d35d8690b6dfce /src/lib/video_decoder.cc | |
| parent | 567abac0d7824f27b8fdcd6fb7da7e5ddae62a0f (diff) | |
Shuffle Job pointers around slightly.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index c11b752ae..c1f48cb5e 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -28,8 +28,8 @@ using boost::shared_ptr; using boost::optional; -VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j) - : Decoder (f, o, j) +VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o) + : Decoder (f, o) , _video_frame (0) , _last_source_time (0) { @@ -110,9 +110,11 @@ VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s) } void -VideoDecoder::set_progress () const +VideoDecoder::set_progress (Job* j) const { - if (_job && _film->length()) { - _job->set_progress (float (_video_frame) / _film->length().get()); + assert (j); + + if (_film->length()) { + j->set_progress (float (_video_frame) / _film->length().get()); } } |